From 4bbc25e8d4c29023b7b43356a871bbeceee8f287 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Tue, 5 Jun 2012 09:46:07 -0700 Subject: [PATCH] --- yaml --- r: 311128 b: refs/heads/master c: f109293f5889dd30477564a3ce2c901f4024a53e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/serial_txx9.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4f4c5fc096b9..e83e59a9425d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58bcd3322944f31c9a8b02694e221c645cf4ffd9 +refs/heads/master: f109293f5889dd30477564a3ce2c901f4024a53e diff --git a/trunk/drivers/tty/serial/serial_txx9.c b/trunk/drivers/tty/serial/serial_txx9.c index 34bd345da775..6ae2a58d62f2 100644 --- a/trunk/drivers/tty/serial/serial_txx9.c +++ b/trunk/drivers/tty/serial/serial_txx9.c @@ -466,7 +466,7 @@ static void serial_txx9_break_ctl(struct uart_port *port, int break_state) spin_unlock_irqrestore(&up->port.lock, flags); } -#if defined(CONFIG_SERIAL_TXX9_CONSOLE) || (CONFIG_CONSOLE_POLL) +#if defined(CONFIG_SERIAL_TXX9_CONSOLE) || defined(CONFIG_CONSOLE_POLL) /* * Wait for transmitter & holding register to empty */