summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-26 08:58:45 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-26 08:58:45 -0700
commitacbbe6c28a914db837ad8b75773b0a8f873a718a (patch)
tree600f9177122b429ff5187d9c162197169d170293 /drivers
parent9a22e330e9cbab8deab2db913a0d37bb99140ecb (diff)
parent744551cceb73acd62189cb4afe0a336b2c9684d8 (diff)
downloadop-kernel-dev-acbbe6c28a914db837ad8b75773b0a8f873a718a.zip
op-kernel-dev-acbbe6c28a914db837ad8b75773b0a8f873a718a.tar.gz
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.
Diffstat (limited to 'drivers')
-rw-r--r--drivers/serial/sunsab.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c
index e348ba6..ff610c2 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
OpenPOWER on IntegriCloud