diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-11-10 21:10:34 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-11-10 21:10:34 -0500 |
| commit | 774facda20d2f8f0f61fa312d8028dad18ac5ee4 (patch) | |
| tree | a9068b769fa5956beaabc2445ebe1d575585d7d3 /arch/arm/mach-omap2/powerdomain.c | |
| parent | b419148e567728f6af0c3b01965c1cc141e3e13a (diff) | |
| parent | ce491cf85466c3377228c5a852ea627ec5136956 (diff) | |
Merge branch '7xx-iosplit-plat' with omap-fixes
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 f00289abd30f..b6990e377783 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 | ||