diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-14 14:04:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-14 14:04:13 -0700 |
| commit | 53a3f3087be361dacfc02e7a85b6d6142a41ce8a (patch) | |
| tree | 7f8ce78b0a7063361b9818e94044c000bf15007a /arch | |
| parent | 6455c66a8750170c2b4a41c6f6c53310a49e08ce (diff) | |
| parent | 0931ce8439365358b1cacf888ddc8fb008036125 (diff) | |
| download | kernel-crypto-53a3f3087be361dacfc02e7a85b6d6142a41ce8a.tar.gz kernel-crypto-53a3f3087be361dacfc02e7a85b6d6142a41ce8a.tar.xz kernel-crypto-53a3f3087be361dacfc02e7a85b6d6142a41ce8a.zip | |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
Blackfin arch: fix some bugs in lib/string.h functions found by our string testing modules
Blackfin arch: fix the aliased write macros
Blackfin arch: Update/Fix PM support add new pm_ops valid
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/blackfin/mach-common/pm.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/blackfin/mach-common/pm.c b/arch/blackfin/mach-common/pm.c index 1772d8d2c1a..b1030272220 100644 --- a/arch/blackfin/mach-common/pm.c +++ b/arch/blackfin/mach-common/pm.c @@ -158,10 +158,16 @@ static int bfin_pm_finish(suspend_state_t state) return 0; } +static int bfin_pm_valid(suspend_state_t state) +{ + return (state == PM_SUSPEND_STANDBY); +} + struct pm_ops bfin_pm_ops = { .prepare = bfin_pm_prepare, .enter = bfin_pm_enter, .finish = bfin_pm_finish, + .valid = bfin_pm_valid, }; static int __init bfin_pm_init(void) |