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-omap2/opp2430_data.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-omap2/opp2430_data.c')
-rw-r--r-- | arch/arm/mach-omap2/opp2430_data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/opp2430_data.c b/arch/arm/mach-omap2/opp2430_data.c index 750805c528d..0e75ec3e114 100644 --- a/arch/arm/mach-omap2/opp2430_data.c +++ b/arch/arm/mach-omap2/opp2430_data.c | |||
@@ -26,7 +26,7 @@ | |||
26 | * This is technically part of the OMAP2xxx clock code. | 26 | * This is technically part of the OMAP2xxx clock code. |
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include <plat/hardware.h> | 29 | #include <linux/kernel.h> |
30 | 30 | ||
31 | #include "opp2xxx.h" | 31 | #include "opp2xxx.h" |
32 | #include "sdrc.h" | 32 | #include "sdrc.h" |