diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-06-17 10:32:26 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-06-17 10:32:26 -0400 |
| commit | f8db4cc4f2b11bdded6c94f0d55906847474b982 (patch) | |
| tree | d1b99d186edb9d203fafd896f19487125a2395af /arch/arm/mach-omap2/board-apollon.c | |
| parent | 2e2de2e314672c8b6644f67a35556d6df780493d (diff) | |
| parent | e479c60456ef22b0869432887216186aabaed086 (diff) | |
Merge branch 'spi/merge' into spi/next
Diffstat (limited to 'arch/arm/mach-omap2/board-apollon.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-apollon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c index f3beb8eeef7..b124bdfb423 100644 --- a/arch/arm/mach-omap2/board-apollon.c +++ b/arch/arm/mach-omap2/board-apollon.c | |||
| @@ -27,13 +27,13 @@ | |||
| 27 | #include <linux/err.h> | 27 | #include <linux/err.h> |
| 28 | #include <linux/clk.h> | 28 | #include <linux/clk.h> |
| 29 | #include <linux/smc91x.h> | 29 | #include <linux/smc91x.h> |
| 30 | #include <linux/gpio.h> | ||
| 30 | 31 | ||
| 31 | #include <mach/hardware.h> | 32 | #include <mach/hardware.h> |
| 32 | #include <asm/mach-types.h> | 33 | #include <asm/mach-types.h> |
| 33 | #include <asm/mach/arch.h> | 34 | #include <asm/mach/arch.h> |
| 34 | #include <asm/mach/flash.h> | 35 | #include <asm/mach/flash.h> |
| 35 | 36 | ||
| 36 | #include <mach/gpio.h> | ||
| 37 | #include <plat/led.h> | 37 | #include <plat/led.h> |
| 38 | #include <plat/usb.h> | 38 | #include <plat/usb.h> |
| 39 | #include <plat/board.h> | 39 | #include <plat/board.h> |