Merge branch 'for_3.1/pm-fixes-2' of git://gitorious.org/khilman/linu…

…x-omap-pm into fixes
mariux64 · Sep 12, 2011 · 15ce928 · 15ce928
2 parents d035953 + 126caf1
commit 15ce928
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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 = {