Subject: Re: linux-next: manual merge of the wireless tree with Linus' tree

From: Ohad Ben-Cohen <[email-masked]>
Date: Tue, 21 Sep 2010 10:57:29 +0200

On Tue, Sep 21, 2010 at 8:53 AM, Ohad Ben-Cohen <[email-masked]> wrote:
> On Tue, Sep 21, 2010 at 4:09 AM, Stephen Rothwell <[email-masked]> 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/[email-masked]/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 <linux/spi/wl12xx.h>"
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                    [email-masked]
>>
>> 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 @@@
>>  #include <linux/spi/ads7846.h>
>>  #include <linux/regulator/machine.h>
>>  #include <linux/i2c/twl.h>
>> - #include <linux/spi/wl12xx.h>
>> + #include <linux/wl12xx.h>
>>  +#include <linux/mtd/partitions.h>
>>  +#include <linux/mtd/nand.h>
>>  #include <linux/leds.h>
>>  #include <linux/input.h>
>>  #include <linux/input/matrix_keypad.h>
>>
>