diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-06 18:44:34 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-06 18:44:34 +1100 |
| commit | 0823aabca99896bc07d24e8ba7990183ccb4b92e (patch) | |
| tree | e0a6cfc268cadbb6e89032563411ee07e5082f1a /kernel | |
| parent | 71a51ca1cb676e188ee15cfdc350ee2f25501f99 (diff) | |
| parent | 80d8611dd07603736d14e4a942546bdc84dd5477 (diff) | |
Merge remote-tracking branch 'tty/tty-next'
Conflicts:
drivers/tty/serial/atmel_serial.c
drivers/tty/serial/imx.c
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sysctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 5c704dbf6d45..9aa71cec9e0e 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -190,7 +190,7 @@ static int proc_dostring_coredump(struct ctl_table *table, int write, #ifdef CONFIG_MAGIC_SYSRQ /* Note: sysrq code uses it's own private copy */ -static int __sysrq_enabled = SYSRQ_DEFAULT_ENABLE; +static int __sysrq_enabled = CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE; static int sysrq_sysctl_handler(ctl_table *table, int write, void __user *buffer, size_t *lenp, |