diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-26 11:58:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-26 11:58:45 -0400 |
| commit | acbbe6c28a914db837ad8b75773b0a8f873a718a (patch) | |
| tree | 600f9177122b429ff5187d9c162197169d170293 | |
| parent | 9a22e330e9cbab8deab2db913a0d37bb99140ecb (diff) | |
| parent | 744551cceb73acd62189cb4afe0a336b2c9684d8 (diff) | |
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 @@ | |||
| 38 | #include <asm/prom.h> | 38 | #include <asm/prom.h> |
| 39 | #include <asm/of_device.h> | 39 | #include <asm/of_device.h> |
| 40 | 40 | ||
| 41 | #if defined(CONFIG_SERIAL_SUNZILOG_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 41 | #if defined(CONFIG_SERIAL_SUNSAB_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
| 42 | #define SUPPORT_SYSRQ | 42 | #define SUPPORT_SYSRQ |
| 43 | #endif | 43 | #endif |
| 44 | 44 | ||