From: Pavel Machek Date: Sun, 9 Jan 2011 07:38:48 +0000 (+0100) Subject: serial: unbreak billionton CF card X-Git-Tag: v2.6.32.29~59 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bd577e06041f41ac77c8e44ad4047502483cc439;p=karo-tx-linux.git serial: unbreak billionton CF card commit d0694e2aeb815042aa0f3e5036728b3db4446f1d upstream. Unbreak Billionton CF bluetooth card. This actually fixes a regression on zaurus. Signed-off-by: Pavel Machek Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c index 5ed1b828a7ca..6a451e8a43ff 100644 --- a/drivers/serial/8250.c +++ b/drivers/serial/8250.c @@ -255,7 +255,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_RSA] = { .name = "RSA",