Hi Stephen, On Tue, Sep 21, 2010 at 4:09 AM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxx/msg34910.html but it seems an older patch accidentally got in. > only the new one ... I fixed the above conflict (see below) on the > assumption that the spi/ version of the header file should have been > removed. Yes, thank you. I'll send a patch to fix that in the wireless tree too. Thanks, Ohad. > -- > Cheers, > Stephen Rothwell sfr@xxxxxxxxxxxxxxxx > > 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> > -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
