diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-09-12 14:30:22 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-09-12 14:30:22 -0400 |
| commit | 15ce92861f7fe59de83667c0124a7ead3423c7a0 (patch) | |
| tree | 83935958fbe17d3eccec58b989c1ea740ce73870 /arch/arm | |
| parent | d035953e59ca8bb7ffc1023efba72438524457bb (diff) | |
| parent | 126caf1376e75ce597f993b66241210c7171b04e (diff) | |
Merge branch 'for_3.1/pm-fixes-2' of git://gitorious.org/khilman/linux-omap-pm into fixes
Diffstat (limited to 'arch/arm')
| -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 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) | |||
| 615 | 615 | ||
| 616 | return pm_generic_resume_noirq(dev); | 616 | return pm_generic_resume_noirq(dev); |
| 617 | } | 617 | } |
| 618 | #else | ||
| 619 | #define _od_suspend_noirq NULL | ||
| 620 | #define _od_resume_noirq NULL | ||
| 618 | #endif | 621 | #endif |
| 619 | 622 | ||
| 620 | static struct dev_pm_domain omap_device_pm_domain = { | 623 | static struct dev_pm_domain omap_device_pm_domain = { |