git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
plat-omap
/
omap_device.c
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);
}
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 = {
#endif
static struct dev_pm_domain omap_device_pm_domain = {