---

yaml --- r: 232585 b: refs/heads/master c: d0694e2 h: refs/heads/master i: 232583: 7e25c67 v: v3
git-mirror · Jan 23, 2011 · b9eabc0 · b9eabc0
1 parent 2c5e9eb
commit b9eabc0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2a6a822adc2a91c677cb60e9bc6ffe26fa90e9f
+refs/heads/master: d0694e2aeb815042aa0f3e5036728b3db4446f1d
diff --git a/trunk/drivers/tty/serial/8250.c b/trunk/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",