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/plat-omap/include/plat/cpu.h | |
| 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/plat-omap/include/plat/cpu.h')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/cpu.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h index bb5d08a70dbc..67da857783ce 100644 --- a/arch/arm/plat-omap/include/plat/cpu.h +++ b/arch/arm/plat-omap/include/plat/cpu.h | |||
| @@ -30,6 +30,8 @@ | |||
| 30 | #ifndef __ASM_ARCH_OMAP_CPU_H | 30 | #ifndef __ASM_ARCH_OMAP_CPU_H |
| 31 | #define __ASM_ARCH_OMAP_CPU_H | 31 | #define __ASM_ARCH_OMAP_CPU_H |
| 32 | 32 | ||
| 33 | #ifndef __ASSEMBLY__ | ||
| 34 | |||
| 33 | #include <linux/bitops.h> | 35 | #include <linux/bitops.h> |
| 34 | #include <plat/multi.h> | 36 | #include <plat/multi.h> |
| 35 | 37 | ||
| @@ -493,4 +495,5 @@ OMAP4_HAS_FEATURE(mpu_1ghz, MPU_1GHZ) | |||
| 493 | OMAP4_HAS_FEATURE(mpu_1_2ghz, MPU_1_2GHZ) | 495 | OMAP4_HAS_FEATURE(mpu_1_2ghz, MPU_1_2GHZ) |
| 494 | OMAP4_HAS_FEATURE(mpu_1_5ghz, MPU_1_5GHZ) | 496 | OMAP4_HAS_FEATURE(mpu_1_5ghz, MPU_1_5GHZ) |
| 495 | 497 | ||
| 498 | #endif /* __ASSEMBLY__ */ | ||
| 496 | #endif | 499 | #endif |