diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-02-01 05:38:49 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-02-01 05:38:49 -0500 |
| commit | 17292ecc07857bb16737c340dda289ab9d219e05 (patch) | |
| tree | 214a208af0e4826b835cd4ee770c7f1573c86b04 /drivers/tty/serial | |
| parent | cd7bb53ff88a5acef942a87c1d04e6211b6470dc (diff) | |
| parent | 0ce08870b8a4895044b6cf2bbdc774a6faaa3656 (diff) | |
Merge branch 'sh/urgent' into sh-latest
Diffstat (limited to 'drivers/tty/serial')
| -rw-r--r-- | drivers/tty/serial/8250.c | 3 | ||||
| -rw-r--r-- | drivers/tty/serial/Kconfig | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/tty/serial/8250.c b/drivers/tty/serial/8250.c index b25e6e490530..3975df6f7fdb 100644 --- a/drivers/tty/serial/8250.c +++ b/drivers/tty/serial/8250.c | |||
| @@ -236,7 +236,8 @@ static const struct serial8250_config uart_config[] = { | |||
| 236 | .fifo_size = 128, | 236 | .fifo_size = 128, |
| 237 | .tx_loadsz = 128, | 237 | .tx_loadsz = 128, |
| 238 | .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10, | 238 | .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10, |
| 239 | .flags = UART_CAP_FIFO | UART_CAP_EFR | UART_CAP_SLEEP, | 239 | /* UART_CAP_EFR breaks billionon CF bluetooth card. */ |
| 240 | .flags = UART_CAP_FIFO | UART_CAP_SLEEP, | ||
| 240 | }, | 241 | }, |
| 241 | [PORT_16654] = { | 242 | [PORT_16654] = { |
| 242 | .name = "ST16654", | 243 | .name = "ST16654", |
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index b1682d7f1d8a..2b8334601c8b 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig | |||
| @@ -1518,6 +1518,7 @@ config SERIAL_BCM63XX_CONSOLE | |||
| 1518 | config SERIAL_GRLIB_GAISLER_APBUART | 1518 | config SERIAL_GRLIB_GAISLER_APBUART |
| 1519 | tristate "GRLIB APBUART serial support" | 1519 | tristate "GRLIB APBUART serial support" |
| 1520 | depends on OF | 1520 | depends on OF |
| 1521 | select SERIAL_CORE | ||
| 1521 | ---help--- | 1522 | ---help--- |
| 1522 | Add support for the GRLIB APBUART serial port. | 1523 | Add support for the GRLIB APBUART serial port. |
| 1523 | 1524 | ||