From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ohad Ben-Cohen Subject: Re: linux-next: manual merge of the wireless tree with Linus' tree Date: Tue, 21 Sep 2010 10:57:29 +0200 Message-ID: References: <20100921120919.a38723d3.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from mail-px0-f174.google.com ([209.85.212.174]:62524 "EHLO mail-px0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755989Ab0IUI5t convert rfc822-to-8bit (ORCPT ); Tue, 21 Sep 2010 04:57:49 -0400 In-Reply-To: Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: "John W. Linville" , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Grazvydas Ignotas , Tony Lindgren On Tue, Sep 21, 2010 at 8:53 AM, Ohad Ben-Cohen wrote= : > On Tue, Sep 21, 2010 at 4:09 AM, Stephen Rothwell wrote: >> The wireless tree commit copied the include/linux/spi/wl12xx.h to >> include/linux but did not remove the spi/ one. > > We had that one fixed in > http://www.mail-archive.com/linux-omap@vger.kernel.org/msg34910.html > but it seems an older patch accidentally got in. Ok, figured this out - the correct patch _was_ taken, but commit 79ccf549b33c613b57eebcb03f8b24644c545a88 ("omap3: pandora: add NAND and wifi support") only came later, so the "#include " was only removed in the merge (so it was dropped from the original patch). Anyway your fix is good Stephen, Thank you. >> -- >> Cheers, >> Stephen Rothwell =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0sfr@canb.auu= g.org.au >> >> diff --cc arch/arm/mach-omap2/board-omap3pandora.c >> index dd3af2b,9b62b62..0000000 >> --- a/arch/arm/mach-omap2/board-omap3pandora.c >> +++ b/arch/arm/mach-omap2/board-omap3pandora.c >> @@@ -25,9 -25,7 +25,9 @@@ >> =A0#include >> =A0#include >> =A0#include >> - #include >> + #include >> =A0+#include >> =A0+#include >> =A0#include >> =A0#include >> =A0#include >> >