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

15ce9286 · Arnd Bergmann · d035953e · 126caf13 · 15ce9286
Commit 15ce9286 authored Sep 12, 2011 by Arnd Bergmann
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

arch/arm/plat-omap/omap_device.c arch/arm/plat-omap/omap_device.c +3 -0

No files found.
--- 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 = {