diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-06-05 14:42:27 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-06-05 14:42:27 -0400 |
| commit | dea58b80f2625d3712645fb6ff0af45866cedaae (patch) | |
| tree | b9c0d4f7d4fcd90e438b5cc5d05471e52615a62d /arch/powerpc/platforms/powermac/setup.c | |
| parent | b1141f6d5dead296adcabd4a1e8ea2b994e287cb (diff) | |
| parent | 672c6108a51bf559d19595d9f8193dfd81f0f752 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'arch/powerpc/platforms/powermac/setup.c')
| -rw-r--r-- | arch/powerpc/platforms/powermac/setup.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c index 4d15e396655..b9200fb0781 100644 --- a/arch/powerpc/platforms/powermac/setup.c +++ b/arch/powerpc/platforms/powermac/setup.c @@ -463,11 +463,23 @@ static int pmac_pm_finish(suspend_state_t state) return 0; } +static int pmac_pm_valid(suspend_state_t state) +{ + switch (state) { + case PM_SUSPEND_DISK: + return 1; + /* can't do any other states via generic mechanism yet */ + default: + return 0; + } +} + static struct pm_ops pmac_pm_ops = { .pm_disk_mode = PM_DISK_SHUTDOWN, .prepare = pmac_pm_prepare, .enter = pmac_pm_enter, .finish = pmac_pm_finish, + .valid = pmac_pm_valid, }; #endif /* CONFIG_SOFTWARE_SUSPEND */ |