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/clkt_dpll.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/clkt_dpll.c')
| -rw-r--r-- | arch/arm/mach-omap2/clkt_dpll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/clkt_dpll.c b/arch/arm/mach-omap2/clkt_dpll.c index f0b6b4bb8b0f..a3b60c7b9aa8 100644 --- a/arch/arm/mach-omap2/clkt_dpll.c +++ b/arch/arm/mach-omap2/clkt_dpll.c | |||
| @@ -22,8 +22,8 @@ | |||
| 22 | #include <asm/div64.h> | 22 | #include <asm/div64.h> |
| 23 | 23 | ||
| 24 | #include <plat/clock.h> | 24 | #include <plat/clock.h> |
| 25 | #include <plat/cpu.h> | ||
| 26 | 25 | ||
| 26 | #include "soc.h" | ||
| 27 | #include "clock.h" | 27 | #include "clock.h" |
| 28 | #include "cm-regbits-24xx.h" | 28 | #include "cm-regbits-24xx.h" |
| 29 | #include "cm-regbits-34xx.h" | 29 | #include "cm-regbits-34xx.h" |