diff options
| author | Paul Walmsley <paul@pwsan.com> | 2012-09-23 19:15:44 -0400 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2012-09-23 19:15:44 -0400 |
| commit | 291852e8791a596195edc3ced96481bfd105f35b (patch) | |
| tree | 5ac0d7f65cc21943863301fc50e62a616b168e8d /arch/arm/mach-omap1/board-htcherald.c | |
| parent | 2910f14584eddf2bc0db4baec3c6950ef357b52c (diff) | |
| parent | de6ca33a96a6bf61fcb91d3d399703e19ead9d1e (diff) | |
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-omap1/board-htcherald.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-htcherald.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/board-htcherald.c b/arch/arm/mach-omap1/board-htcherald.c index f0ef0082c317..1dcb751b8fe5 100644 --- a/arch/arm/mach-omap1/board-htcherald.c +++ b/arch/arm/mach-omap1/board-htcherald.c | |||
| @@ -41,8 +41,7 @@ | |||
| 41 | #include <asm/mach-types.h> | 41 | #include <asm/mach-types.h> |
| 42 | #include <asm/mach/arch.h> | 42 | #include <asm/mach/arch.h> |
| 43 | 43 | ||
| 44 | #include <plat/omap7xx.h> | 44 | #include <mach/omap7xx.h> |
| 45 | #include <plat/board.h> | ||
| 46 | #include <plat/keypad.h> | 45 | #include <plat/keypad.h> |
| 47 | #include <plat/mmc.h> | 46 | #include <plat/mmc.h> |
| 48 | 47 | ||