diff options
| author | Paul Walmsley <paul@pwsan.com> | 2012-09-24 01:15:44 +0200 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2012-09-24 01:15:44 +0200 |
| commit | 291852e8791a596195edc3ced96481bfd105f35b (patch) | |
| tree | 5ac0d7f65cc21943863301fc50e62a616b168e8d /arch/arm/mach-omap2/board-apollon.c | |
| parent | Merge tag 'omap-cleanup-b-for-3.7' into test_v3.6-rc6_ocb3.7_cff3.7_odaf3.7 (diff) | |
| parent | ARM: OMAP1: Include gpio-omap.h for board-h2 and board-h3 (diff) | |
| download | linux-291852e8791a596195edc3ced96481bfd105f35b.tar.xz linux-291852e8791a596195edc3ced96481bfd105f35b.zip | |
Merge tag 'cleanup-fixes-for-v3.7' into test_v3.6-rc6_ocb3.7_cff3.7_odaf3.7
These fixes are needed to fix non-omap build breakage for
twl-core driver and to fix omap1_defconfig compile when
led driver changes and omap sparse IRQ changes are merged
together. Also fix warnings for omaps not using pinctrl
framework yet.
Diffstat (limited to 'arch/arm/mach-omap2/board-apollon.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-apollon.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c index e5fa46bfde2f..3e2d76f05af4 100644 --- a/arch/arm/mach-omap2/board-apollon.c +++ b/arch/arm/mach-omap2/board-apollon.c @@ -29,13 +29,11 @@ #include <linux/smc91x.h> #include <linux/gpio.h> -#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/flash.h> #include <plat/led.h> -#include <plat/board.h> #include "common.h" #include <plat/gpmc.h> |