diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-14 14:29:56 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-14 14:29:56 +1000 |
| commit | bab2e568e03396d86d8e908665ff5ef045675ac8 (patch) | |
| tree | 8f724a4f055603cad5df442ee624d836dbe80832 /kernel | |
| parent | aa8689882ee63e881bdb1da0d55d9e623f996458 (diff) | |
| parent | e9af5cfe88e7f9f60977756aef27a63c2a51b39b (diff) | |
Merge commit 'trivial/for-next'
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/power/poweroff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/poweroff.c b/kernel/power/poweroff.c index 97890831e1b5..e8b337006276 100644 --- a/kernel/power/poweroff.c +++ b/kernel/power/poweroff.c @@ -34,7 +34,7 @@ static struct sysrq_key_op sysrq_poweroff_op = { .handler = handle_poweroff, .help_msg = "powerOff", .action_msg = "Power Off", - .enable_mask = SYSRQ_ENABLE_BOOT, + .enable_mask = SYSRQ_ENABLE_BOOT, }; static int pm_sysrq_init(void) |