diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /arch/arm/mach-omap2/clock.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'arch/arm/mach-omap2/clock.c')
| -rw-r--r-- | arch/arm/mach-omap2/clock.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c index f2a92d614f0..4716206547a 100644 --- a/arch/arm/mach-omap2/clock.c +++ b/arch/arm/mach-omap2/clock.c | |||
| @@ -24,13 +24,13 @@ | |||
| 24 | #include <linux/io.h> | 24 | #include <linux/io.h> |
| 25 | #include <linux/bitops.h> | 25 | #include <linux/bitops.h> |
| 26 | 26 | ||
| 27 | #include <mach/clock.h> | 27 | #include <plat/clock.h> |
| 28 | #include <mach/clockdomain.h> | 28 | #include <plat/clockdomain.h> |
| 29 | #include <mach/cpu.h> | 29 | #include <plat/cpu.h> |
| 30 | #include <mach/prcm.h> | 30 | #include <plat/prcm.h> |
| 31 | #include <asm/div64.h> | 31 | #include <asm/div64.h> |
| 32 | 32 | ||
| 33 | #include <mach/sdrc.h> | 33 | #include <plat/sdrc.h> |
| 34 | #include "sdrc.h" | 34 | #include "sdrc.h" |
| 35 | #include "clock.h" | 35 | #include "clock.h" |
| 36 | #include "prm.h" | 36 | #include "prm.h" |