diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-11-22 13:08:43 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-11-22 13:08:43 -0500 |
| commit | a76df42a675c9936e8bf3607226e74c8a5e2d847 (patch) | |
| tree | 96d93706d884dea956393653452fa4d78d8d7f76 /arch/arm/mach-omap2/clock34xx.c | |
| parent | 648f4e3e50c4793d9dbf9a09afa193631f76fa26 (diff) | |
| parent | 8171d88089ad63fc442b2bf32af7c18653adc5cb (diff) | |
Merge 7xx-iosplit-plat-merge with omap-fixes
Merge branch '7xx-iosplit-plat-merge' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/clock34xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/clock34xx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c index 7c5c00df3c70..225c1a7385ee 100644 --- a/arch/arm/mach-omap2/clock34xx.c +++ b/arch/arm/mach-omap2/clock34xx.c | |||
| @@ -27,13 +27,13 @@ | |||
| 27 | #include <linux/limits.h> | 27 | #include <linux/limits.h> |
| 28 | #include <linux/bitops.h> | 28 | #include <linux/bitops.h> |
| 29 | 29 | ||
| 30 | #include <mach/cpu.h> | 30 | #include <plat/cpu.h> |
| 31 | #include <mach/clock.h> | 31 | #include <plat/clock.h> |
| 32 | #include <mach/sram.h> | 32 | #include <plat/sram.h> |
| 33 | #include <asm/div64.h> | 33 | #include <asm/div64.h> |
| 34 | #include <asm/clkdev.h> | 34 | #include <asm/clkdev.h> |
| 35 | 35 | ||
| 36 | #include <mach/sdrc.h> | 36 | #include <plat/sdrc.h> |
| 37 | #include "clock.h" | 37 | #include "clock.h" |
| 38 | #include "prm.h" | 38 | #include "prm.h" |
| 39 | #include "prm-regbits-34xx.h" | 39 | #include "prm-regbits-34xx.h" |