diff options
| author | Pavel Machek <pavel@ucw.cz> | 2011-01-09 08:38:48 +0100 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2011-04-30 16:52:59 +0200 |
| commit | 2132f453404eae628e4bd19c2bf9652f49f75f57 (patch) | |
| tree | ae5b248de8d2feeef58c12b7da3702e233606ffb /drivers | |
| parent | 64a5041185f14c1f5bef1f53ff7ab30216bc284f (diff) | |
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 <pavel@ucw.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/8250.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c index f84f068245aa..acb0ab431019 100644 --- a/drivers/serial/8250.c +++ b/drivers/serial/8250.c @@ -237,7 +237,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", |