summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2011-01-09 08:38:48 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-01-22 19:15:01 -0800
commitd0694e2aeb815042aa0f3e5036728b3db4446f1d (patch)
tree11e5bacd2f28df6a649dd7db707a9a697c301f9f
parenta2a6a822adc2a91c677cb60e9bc6ffe26fa90e9f (diff)
downloadlinux-d0694e2aeb815042aa0f3e5036728b3db4446f1d.tar.bz2
serial: unbreak billionton CF card
Unbreak Billionton CF bluetooth card. This actually fixes a regression on zaurus. Signed-off-by: Pavel Machek <pavel@ucw.cz> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/tty/serial/8250.c3
1 files changed, 2 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[] = {
.fifo_size = 128,
.tx_loadsz = 128,
.fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
- .flags = UART_CAP_FIFO | UART_CAP_EFR | UART_CAP_SLEEP,
+ /* UART_CAP_EFR breaks billionon CF bluetooth card. */
+ .flags = UART_CAP_FIFO | UART_CAP_SLEEP,
},
[PORT_16654] = {
.name = "ST16654",