diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-09-15 16:06:11 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-09-15 16:06:11 -0700 |
| commit | ceb1c532ba6220900e61ec7073a9234661efa450 (patch) | |
| tree | b7c5b94f09a6893625bb12b7795de3d44fece450 /arch/arm/plat-omap/omap_device.c | |
| parent | 8f5b5a41ebc750ffcc2c410371b2b4998955709e (diff) | |
| parent | 00c46b3069c1ee9aa31db3057e9224685af52efa (diff) | |
| download | blackbird-op-linux-ceb1c532ba6220900e61ec7073a9234661efa450.tar.gz blackbird-op-linux-ceb1c532ba6220900e61ec7073a9234661efa450.zip | |
Merge branch 'omap_chip_remove_cleanup_3.2' of git://git.pwsan.com/linux-2.6 into cleanup
Diffstat (limited to 'arch/arm/plat-omap/omap_device.c')
| -rw-r--r-- | arch/arm/plat-omap/omap_device.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c index b6b409744954..9a6a53854911 100644 --- a/arch/arm/plat-omap/omap_device.c +++ b/arch/arm/plat-omap/omap_device.c @@ -622,7 +622,8 @@ static struct dev_pm_domain omap_device_pm_domain = { SET_RUNTIME_PM_OPS(_od_runtime_suspend, _od_runtime_resume, _od_runtime_idle) USE_PLATFORM_PM_SLEEP_OPS - SET_SYSTEM_SLEEP_PM_OPS(_od_suspend_noirq, _od_resume_noirq) + .suspend_noirq = _od_suspend_noirq, + .resume_noirq = _od_resume_noirq, } }; |
