diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-25 12:45:49 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-25 12:45:49 -0400 |
| commit | 09d4a80e66cdf3e68cdb06e907f7bc0b242acbd0 (patch) | |
| tree | 29e6a11bffc92f6b8393344cab209e1f2b8bf7a9 /drivers/serial | |
| parent | d0d59b98d7a0b3801ce03e695ba885b698a6d122 (diff) | |
| parent | 9c2c38a122cc23d6a09b8004d60a33913683eedf (diff) | |
Merge HEAD from ../from-linus
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/serial/m32r_sio.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 56de409f486d..b87122a08488 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig | |||
| @@ -211,7 +211,7 @@ comment "Non-8250 serial port support" | |||
| 211 | 211 | ||
| 212 | config SERIAL_AMBA_PL010 | 212 | config SERIAL_AMBA_PL010 |
| 213 | tristate "ARM AMBA PL010 serial port support" | 213 | tristate "ARM AMBA PL010 serial port support" |
| 214 | depends on ARM_AMBA | 214 | depends on ARM_AMBA && (BROKEN || !ARCH_VERSATILE) |
| 215 | select SERIAL_CORE | 215 | select SERIAL_CORE |
| 216 | help | 216 | help |
| 217 | This selects the ARM(R) AMBA(R) PrimeCell PL010 UART. If you have | 217 | This selects the ARM(R) AMBA(R) PrimeCell PL010 UART. If you have |
| @@ -819,7 +819,7 @@ config SERIAL_M32R_SIO_CONSOLE | |||
| 819 | 819 | ||
| 820 | config SERIAL_M32R_PLDSIO | 820 | config SERIAL_M32R_PLDSIO |
| 821 | bool "M32R SIO I/F on a PLD" | 821 | bool "M32R SIO I/F on a PLD" |
| 822 | depends on SERIAL_M32R_SIO=y | 822 | depends on SERIAL_M32R_SIO=y && (PLAT_OPSPUT || PALT_USRV || PLAT_M32700UT) |
| 823 | default n | 823 | default n |
| 824 | help | 824 | help |
| 825 | Say Y here if you want to use the M32R serial controller | 825 | Say Y here if you want to use the M32R serial controller |
diff --git a/drivers/serial/m32r_sio.c b/drivers/serial/m32r_sio.c index 0301feacbde4..9b50560b9d16 100644 --- a/drivers/serial/m32r_sio.c +++ b/drivers/serial/m32r_sio.c | |||
| @@ -1123,7 +1123,7 @@ static int __init m32r_sio_console_setup(struct console *co, char *options) | |||
| 1123 | return uart_set_options(port, co, baud, parity, bits, flow); | 1123 | return uart_set_options(port, co, baud, parity, bits, flow); |
| 1124 | } | 1124 | } |
| 1125 | 1125 | ||
| 1126 | extern struct uart_driver m32r_sio_reg; | 1126 | static struct uart_driver m32r_sio_reg; |
| 1127 | static struct console m32r_sio_console = { | 1127 | static struct console m32r_sio_console = { |
| 1128 | .name = "ttyS", | 1128 | .name = "ttyS", |
| 1129 | .write = m32r_sio_console_write, | 1129 | .write = m32r_sio_console_write, |