git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
d035953
)
Merge branch 'for_3.1/pm-fixes-2' of git://gitorious.org/khilman/linux-omap-pm into...
author
Arnd Bergmann
<arnd@arndb.de>
Mon, 12 Sep 2011 18:30:22 +0000
(20:30 +0200)
committer
Arnd Bergmann
<arnd@arndb.de>
Mon, 12 Sep 2011 18:30:22 +0000
(20:30 +0200)
arch/arm/plat-omap/omap_device.c
patch
|
blob
|
history
diff --git
a/arch/arm/plat-omap/omap_device.c
b/arch/arm/plat-omap/omap_device.c
index
9a6a538
..
02609ee
100644
(file)
--- 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 = {