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/powerdomain.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/powerdomain.c')
| -rw-r--r-- | arch/arm/mach-omap2/powerdomain.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c index f00289abd30..b6990e37778 100644 --- a/arch/arm/mach-omap2/powerdomain.c +++ b/arch/arm/mach-omap2/powerdomain.c | |||
| @@ -31,9 +31,9 @@ | |||
| 31 | #include "prm.h" | 31 | #include "prm.h" |
| 32 | #include "prm-regbits-34xx.h" | 32 | #include "prm-regbits-34xx.h" |
| 33 | 33 | ||
| 34 | #include <mach/cpu.h> | 34 | #include <plat/cpu.h> |
| 35 | #include <mach/powerdomain.h> | 35 | #include <plat/powerdomain.h> |
| 36 | #include <mach/clockdomain.h> | 36 | #include <plat/clockdomain.h> |
| 37 | 37 | ||
| 38 | #include "pm.h" | 38 | #include "pm.h" |
| 39 | 39 | ||