From b9eabc04fc0586f0931c6e03a93cef956aae464e Mon Sep 17 00:00:00 2001
From: Pavel Machek <pavel@ucw.cz>
Date: Sun, 9 Jan 2011 08:38:48 +0100
Subject: [PATCH] --- yaml --- r: 232585 b: refs/heads/master c:
 d0694e2aeb815042aa0f3e5036728b3db4446f1d h: refs/heads/master i:   232583:
 7e25c67894bd31aabe7e0c4ddd14656f819fd2d5 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/tty/serial/8250.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d58046a1c99f..13f9e3c0fd08 100644
--- 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
index b25e6e490530..3975df6f7fdb 100644
--- 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",