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/powerdomains.h | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'arch/arm/mach-omap2/powerdomains.h')
| -rw-r--r-- | arch/arm/mach-omap2/powerdomains.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/powerdomains.h b/arch/arm/mach-omap2/powerdomains.h index 691470ea4c6..057b2e3e2c3 100644 --- a/arch/arm/mach-omap2/powerdomains.h +++ b/arch/arm/mach-omap2/powerdomains.h | |||
| @@ -63,7 +63,7 @@ | |||
| 63 | * XXX encode hardware fixed wakeup dependencies -- esp. for 3430 CORE | 63 | * XXX encode hardware fixed wakeup dependencies -- esp. for 3430 CORE |
| 64 | */ | 64 | */ |
| 65 | 65 | ||
| 66 | #include <mach/powerdomain.h> | 66 | #include <plat/powerdomain.h> |
| 67 | 67 | ||
| 68 | #include "prcm-common.h" | 68 | #include "prcm-common.h" |
| 69 | #include "prm.h" | 69 | #include "prm.h" |