diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-12-22 14:32:24 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-12-22 14:32:24 -0500 |
| commit | 808601b75804475c9022f6375e76b7c62c99a10a (patch) | |
| tree | 355a3100269e88460e36f251ef0ce2f1ed88d52e /arch/arm/mach-omap2/clock.c | |
| parent | c10abbb26513f4ccff89c4d80912cb4d36fcd3e8 (diff) | |
| parent | f17f9726c27c3921e00a5750e85070e6dd7e1ff7 (diff) | |
Merge branch 'integration-2.6.38-for-tony' of git://git.pwsan.com/linux-2.6 into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/clock.c')
| -rw-r--r-- | arch/arm/mach-omap2/clock.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c index b5babf5440e4..2a2f15213add 100644 --- a/arch/arm/mach-omap2/clock.c +++ b/arch/arm/mach-omap2/clock.c | |||
| @@ -24,14 +24,12 @@ | |||
| 24 | #include <linux/bitops.h> | 24 | #include <linux/bitops.h> |
| 25 | 25 | ||
| 26 | #include <plat/clock.h> | 26 | #include <plat/clock.h> |
| 27 | #include <plat/clockdomain.h> | 27 | #include "clockdomain.h" |
| 28 | #include <plat/cpu.h> | 28 | #include <plat/cpu.h> |
| 29 | #include <plat/prcm.h> | 29 | #include <plat/prcm.h> |
| 30 | 30 | ||
| 31 | #include "clock.h" | 31 | #include "clock.h" |
| 32 | #include "prm.h" | 32 | #include "cm2xxx_3xxx.h" |
| 33 | #include "prm-regbits-24xx.h" | ||
| 34 | #include "cm.h" | ||
| 35 | #include "cm-regbits-24xx.h" | 33 | #include "cm-regbits-24xx.h" |
| 36 | #include "cm-regbits-34xx.h" | 34 | #include "cm-regbits-34xx.h" |
| 37 | 35 | ||