diff options
author | John W. Linville <linville@tuxdriver.com> | 2010-09-21 21:49:14 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-09-21 21:49:14 +0200 |
commit | b618f6f885579a6237e5bf4582fa6167972ddef4 (patch) | |
tree | b11508178570b98ce9cb2d76ecebd046a6f0e77c /arch/arm/mach-omap2/board-omap3pandora.c | |
parent | bridge : Sanitize skb before it enters the IP stack (diff) | |
parent | ath9k: make the driver specific rate control module optional (diff) | |
download | linux-b618f6f885579a6237e5bf4582fa6167972ddef4.tar.xz linux-b618f6f885579a6237e5bf4582fa6167972ddef4.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
arch/arm/mach-omap2/board-omap3pandora.c
drivers/net/wireless/ath/ath5k/base.c
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3pandora.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3pandora.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c index dd3af2be13be..7ea1eb4a26b4 100644 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c @@ -25,7 +25,7 @@ #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> |