diff options
| author | Kevin Hilman <khilman@ti.com> | 2011-09-01 10:59:36 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@ti.com> | 2011-09-06 13:19:58 -0700 |
| commit | 126caf1376e75ce597f993b66241210c7171b04e (patch) | |
| tree | 19ed472c4ea734136469410e4bb93496a205829c /arch | |
| parent | c6a389f123b9f68d605bb7e0f9b32ec1e3e14132 (diff) | |
| download | op-kernel-dev-126caf1376e75ce597f993b66241210c7171b04e.zip op-kernel-dev-126caf1376e75ce597f993b66241210c7171b04e.tar.gz | |
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 <arnd@arndb.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/plat-omap/omap_device.c | 3 |
1 files changed, 3 insertions, 0 deletions
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 @@ 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 = { |
