diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-09-21 15:49:14 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-09-21 15:49:14 -0400 |
| commit | b618f6f885579a6237e5bf4582fa6167972ddef4 (patch) | |
| tree | b11508178570b98ce9cb2d76ecebd046a6f0e77c /arch/arm/mach-omap2/board-rx51-peripherals.c | |
| parent | 462fb2af9788a82a534f8184abfde31574e1cfa0 (diff) | |
| parent | 6e5c2b4e8addfaab8ef54dedaf7b607e1585c35b (diff) | |
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-rx51-peripherals.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-rx51-peripherals.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index 9a5eb87425fc..ce28a851dcd3 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | #include <linux/input.h> | 14 | #include <linux/input.h> |
| 15 | #include <linux/input/matrix_keypad.h> | 15 | #include <linux/input/matrix_keypad.h> |
| 16 | #include <linux/spi/spi.h> | 16 | #include <linux/spi/spi.h> |
| 17 | #include <linux/spi/wl12xx.h> | 17 | #include <linux/wl12xx.h> |
| 18 | #include <linux/i2c.h> | 18 | #include <linux/i2c.h> |
| 19 | #include <linux/i2c/twl.h> | 19 | #include <linux/i2c/twl.h> |
| 20 | #include <linux/clk.h> | 20 | #include <linux/clk.h> |