diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-26 17:58:45 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-26 17:58:45 +0200 |
| commit | acbbe6c28a914db837ad8b75773b0a8f873a718a (patch) | |
| tree | 600f9177122b429ff5187d9c162197169d170293 | |
| parent | Merge branch 'trivial' of git://git.kernel.dk/data/git/linux-2.6-block (diff) | |
| parent | [SUNSAB]: Fix broken SYSRQ. (diff) | |
| download | linux-acbbe6c28a914db837ad8b75773b0a8f873a718a.tar.xz linux-acbbe6c28a914db837ad8b75773b0a8f873a718a.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SUNSAB]: Fix broken SYSRQ.
| -rw-r--r-- | drivers/serial/sunsab.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c index e348ba684050..ff610c23314b 100644 --- a/drivers/serial/sunsab.c +++ b/drivers/serial/sunsab.c @@ -38,7 +38,7 @@ #include <asm/prom.h> #include <asm/of_device.h> -#if defined(CONFIG_SERIAL_SUNZILOG_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) +#if defined(CONFIG_SERIAL_SUNSAB_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) #define SUPPORT_SYSRQ #endif |