| commit | 15ce92861f7fe59de83667c0124a7ead3423c7a0 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Mon Sep 12 20:30:22 2011 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Mon Sep 12 20:30:22 2011 +0200 |
| tree | 83935958fbe17d3eccec58b989c1ea740ce73870 | |
| parent | d035953e59ca8bb7ffc1023efba72438524457bb [diff] | |
| parent | 126caf1376e75ce597f993b66241210c7171b04e [diff] |
Merge branch 'for_3.1/pm-fixes-2' of git://gitorious.org/khilman/linux-omap-pm into fixes
diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c index 9a6a538..02609ee 100644 --- a/arch/arm/plat-omap/omap_device.c +++ b/arch/arm/plat-omap/omap_device.c
@@ -615,6 +615,9 @@ 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 = {