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/plat-omap/omap-pm-noop.c | |
| parent | b419148e567728f6af0c3b01965c1cc141e3e13a (diff) | |
| parent | ce491cf85466c3377228c5a852ea627ec5136956 (diff) | |
Merge branch '7xx-iosplit-plat' with omap-fixes
Diffstat (limited to 'arch/arm/plat-omap/omap-pm-noop.c')
| -rw-r--r-- | arch/arm/plat-omap/omap-pm-noop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/omap-pm-noop.c b/arch/arm/plat-omap/omap-pm-noop.c index e98f0a2a6c26..186bca82cfab 100644 --- a/arch/arm/plat-omap/omap-pm-noop.c +++ b/arch/arm/plat-omap/omap-pm-noop.c | |||
| @@ -22,9 +22,9 @@ | |||
| 22 | #include <linux/device.h> | 22 | #include <linux/device.h> |
| 23 | 23 | ||
| 24 | /* Interface documentation is in mach/omap-pm.h */ | 24 | /* Interface documentation is in mach/omap-pm.h */ |
| 25 | #include <mach/omap-pm.h> | 25 | #include <plat/omap-pm.h> |
| 26 | 26 | ||
| 27 | #include <mach/powerdomain.h> | 27 | #include <plat/powerdomain.h> |
| 28 | 28 | ||
| 29 | struct omap_opp *dsp_opps; | 29 | struct omap_opp *dsp_opps; |
| 30 | struct omap_opp *mpu_opps; | 30 | struct omap_opp *mpu_opps; |