Merge branch 'for_3.1/pm-fixes-2' of git://gitorious.org/khilman/linux-omap-pm into fixes

2011-09-12 20:30:22 +02:00 · 2011-09-12 20:30:22 +02:00 · 15ce92861f
parent d035953e59 126caf1376
commit 15ce92861f
1 changed files with 3 additions and 0 deletions
--- 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 = {