From 126caf1376e75ce597f993b66241210c7171b04e Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Thu, 1 Sep 2011 10:59:36 -0700 Subject: OMAP: omap_device: fix !CONFIG_SUSPEND case in _noirq handlers The suspend/resume _noirq handlers were #ifdef'd out in the !CONFIG_SUSPEND case, but were still assigned to the dev_pm_ops struct. Fix by defining them to NULL in the !CONFIG_SUSPEND case. Reported-by: Arnd Bergmann Acked-by: Arnd Bergmann Signed-off-by: Kevin Hilman --- arch/arm/plat-omap/omap_device.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'arch/arm') diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c index 9a6a53854911..02609eee0562 100644 --- 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 = { -- cgit v1.2.3-58-ga151