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

[Stephen Rothwell]

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
arch/arm/mach-omap2/board-omap3pandora.c between commit
79ccf549b33c613b57eebcb03f8b24644c545a88 ("omap3: pandora: add NAND and
wifi support") from Linus' tree and commit
664279b5121b480f31ffecf202cd2d1591ff356e ("wl12xx: make wl12xx.h common
to both spi and sdio") from the wireless tree.

The wireless tree commit copied the include/linux/spi/wl12xx.h to
include/linux but did not remove the spi/ one.  Later patches modified
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.
-- 
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-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/