Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

Arnd Bergmann 13 years ago
parent
d035953e59 126caf1376
commit
15ce92861f
1 changed files with 3 additions and 0 deletions
Unified View Show Diff Stats
  1. 3 0
      arch/arm/plat-omap/omap_device.c

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

@@ -615,6 +615,9 @@ static int _od_resume_noirq(struct device *dev)
 
 
 
 	return pm_generic_resume_noirq(dev);
 
 	return pm_generic_resume_noirq(dev);
 
 }
 
 }
 
+#else
 
+#define _od_suspend_noirq NULL
 
+#define _od_resume_noirq NULL
 
 #endif
 
 #endif
 
 
 
 static struct dev_pm_domain omap_device_pm_domain = {
 
 static struct dev_pm_domain omap_device_pm_domain = {