aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-09-12 20:30:22 +0200
committerArnd Bergmann <arnd@arndb.de>2011-09-12 20:30:22 +0200
commit15ce92861f7fe59de83667c0124a7ead3423c7a0 (patch)
tree83935958fbe17d3eccec58b989c1ea740ce73870 /arch/arm
parentd035953e59ca8bb7ffc1023efba72438524457bb (diff)
parent126caf1376e75ce597f993b66241210c7171b04e (diff)
Merge branch 'for_3.1/pm-fixes-2' of git://gitorious.org/khilman/linux-omap-pm into fixes
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/plat-omap/omap_device.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c
index 9a6a53854911..02609eee0562 100644
--- a/arch/arm/plat-omap/omap_device.c
+++ b/arch/arm/plat-omap/omap_device.c
@@ -615,6 +615,9 @@ static int _od_resume_noirq(struct device *dev)
return pm_generic_resume_noirq(dev);
}
+#else
+#define _od_suspend_noirq NULL
+#define _od_resume_noirq NULL
#endif
static struct dev_pm_domain omap_device_pm_domain = {

Privacy Policy