aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorYoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>2007-07-31 03:38:56 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-31 18:39:41 -0400
commit2174041d663e4ea825dd53af71b877ea6da736fe (patch)
tree878038d0cee214064f900f441cc000e8bf0197a3 /drivers/serial
parenta95d32094c6564c3be62ef6b396b24ced564932f (diff)
serial: fix vr41xx_siu serial console support
The serial console can select only SERIAL_VR41XX=y. Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> Cc: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/Kconfig2
-rw-r--r--drivers/serial/vr41xx_siu.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 819fc3efc468..64ff6a5f6afd 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -1191,7 +1191,7 @@ config SERIAL_VR41XX
1191 1191
1192config SERIAL_VR41XX_CONSOLE 1192config SERIAL_VR41XX_CONSOLE
1193 bool "Enable NEC VR4100 series Serial Interface Unit console" 1193 bool "Enable NEC VR4100 series Serial Interface Unit console"
1194 depends on SERIAL_VR41XX 1194 depends on SERIAL_VR41XX=y
1195 select SERIAL_CORE_CONSOLE 1195 select SERIAL_CORE_CONSOLE
1196 help 1196 help
1197 If you have a NEC VR4100 series processor and you want to use 1197 If you have a NEC VR4100 series processor and you want to use
diff --git a/drivers/serial/vr41xx_siu.c b/drivers/serial/vr41xx_siu.c
index 0b350971fd32..6fd51b0022ca 100644
--- a/drivers/serial/vr41xx_siu.c
+++ b/drivers/serial/vr41xx_siu.c
@@ -65,7 +65,9 @@ static struct uart_port siu_uart_ports[SIU_PORTS_MAX] = {
65 }, 65 },
66}; 66};
67 67
68#ifdef CONFIG_SERIAL_VR41XX_CONSOLE
68static uint8_t lsr_break_flag[SIU_PORTS_MAX]; 69static uint8_t lsr_break_flag[SIU_PORTS_MAX];
70#endif
69 71
70#define siu_read(port, offset) readb((port)->membase + (offset)) 72#define siu_read(port, offset) readb((port)->membase + (offset))
71#define siu_write(port, offset, value) writeb((value), (port)->membase + (offset)) 73#define siu_write(port, offset, value) writeb((value), (port)->membase + (offset))