projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 35ac2772 GKH |
1 | From d0694e2aeb815042aa0f3e5036728b3db4446f1d Mon Sep 17 00:00:00 2001 |
| 2 | From: Pavel Machek <pavel@ucw.cz> | |
| 3 | Date: Sun, 9 Jan 2011 08:38:48 +0100 | |
| 4 | Subject: serial: unbreak billionton CF card | |
| 5 | ||
| 6 | From: Pavel Machek <pavel@ucw.cz> | |
| 7 | ||
| 8 | commit d0694e2aeb815042aa0f3e5036728b3db4446f1d upstream. | |
| 9 | ||
| 10 | Unbreak Billionton CF bluetooth card. This actually fixes a regression | |
| 11 | on zaurus. | |
| 12 | ||
| 13 | Signed-off-by: Pavel Machek <pavel@ucw.cz> | |
| 14 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
| 15 | ||
| 16 | --- | |
| 17 | drivers/serial/8250.c | 3 ++- | |
| 18 | 1 file changed, 2 insertions(+), 1 deletion(-) | |
| 19 | ||
| 20 | --- a/drivers/serial/8250.c | |
| 21 | +++ b/drivers/serial/8250.c | |
| 22 | @@ -241,7 +241,8 @@ static const struct serial8250_config ua | |
| 23 | .fifo_size = 128, | |
| 24 | .tx_loadsz = 128, | |
| 25 | .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10, | |
| 26 | - .flags = UART_CAP_FIFO | UART_CAP_EFR | UART_CAP_SLEEP, | |
| 27 | + /* UART_CAP_EFR breaks billionon CF bluetooth card. */ | |
| 28 | + .flags = UART_CAP_FIFO | UART_CAP_SLEEP, | |
| 29 | }, | |
| 30 | [PORT_16654] = { | |
| 31 | .name = "ST16654", |