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/pm.h | |
parent | b419148e567728f6af0c3b01965c1cc141e3e13a (diff) | |
parent | ce491cf85466c3377228c5a852ea627ec5136956 (diff) |
Merge branch '7xx-iosplit-plat' with omap-fixes
Diffstat (limited to 'arch/arm/mach-omap2/pm.h')
-rw-r--r-- | arch/arm/mach-omap2/pm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h index 8400f5768923..85b6face5392 100644 --- a/arch/arm/mach-omap2/pm.h +++ b/arch/arm/mach-omap2/pm.h | |||
@@ -11,7 +11,7 @@ | |||
11 | #ifndef __ARCH_ARM_MACH_OMAP2_PM_H | 11 | #ifndef __ARCH_ARM_MACH_OMAP2_PM_H |
12 | #define __ARCH_ARM_MACH_OMAP2_PM_H | 12 | #define __ARCH_ARM_MACH_OMAP2_PM_H |
13 | 13 | ||
14 | #include <mach/powerdomain.h> | 14 | #include <plat/powerdomain.h> |
15 | 15 | ||
16 | extern int omap3_pm_get_suspend_state(struct powerdomain *pwrdm); | 16 | extern int omap3_pm_get_suspend_state(struct powerdomain *pwrdm); |
17 | extern int omap3_pm_set_suspend_state(struct powerdomain *pwrdm, int state); | 17 | extern int omap3_pm_set_suspend_state(struct powerdomain *pwrdm, int state); |