瀏覽代碼

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

Arnd Bergmann 14 年之前
父節點
當前提交
15ce92861f
共有 1 個文件被更改,包括 3 次插入0 次删除
  1. 3 0
      arch/arm/plat-omap/omap_device.c

+ 3 - 0
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 = {