diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-15 11:31:24 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-15 11:31:24 +1000 |
| commit | 47ef09acb684d0e230341103012b29acd4800857 (patch) | |
| tree | 7d75517da8f3e4cf75c60d91547d6d9f96941a3b /drivers | |
| parent | b8b3cae27db073266c669534d24e56e77a10c4f9 (diff) | |
| parent | 93c47fada46e034941106fb34b76a00a87108fc5 (diff) | |
Merge remote branch 'kgdb/kgdb-next'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/sysrq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c index 5d64e3acb000..44e0334a02ba 100644 --- a/drivers/char/sysrq.c +++ b/drivers/char/sysrq.c @@ -721,7 +721,7 @@ int sysrq_toggle_support(int enable_mask) sysrq_unregister_handler(); } - return 0; + return was_enabled; } static int __sysrq_swap_key_ops(int key, struct sysrq_key_op *insert_op_p, |