Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[karo-tx-linux.git] / drivers / tty / serial / serial_txx9.c

diff --git a/drivers/tty/serial/serial_txx9.c b/drivers/tty/serial/serial_txx9.c
index ea8546092c7e10b5828be5dfccaa0f2361e8f7de..af115645c51f7b146fab9695673b85f37e6529a0 100644 (file)
--- a/drivers/tty/serial/serial_txx9.c
+++ b/drivers/tty/serial/serial_txx9.c
@@ -142,7 +142,6 @@ struct uart_txx9_port {
 #define TXX9_SIFCR_RDIL_12     0x00000180
 #define TXX9_SIFCR_RDIL_MAX    0x00000180
 #define TXX9_SIFCR_TDIL_MASK   0x00000018
-#define TXX9_SIFCR_TDIL_MASK   0x00000018
 #define TXX9_SIFCR_TDIL_1      0x00000000
 #define TXX9_SIFCR_TDIL_4      0x00000001
 #define TXX9_SIFCR_TDIL_8      0x00000010
@@ -244,11 +243,6 @@ static void serial_txx9_stop_rx(struct uart_port *port)
        up->port.read_status_mask &= ~TXX9_SIDISR_RDIS;
 }
 
-static void serial_txx9_enable_ms(struct uart_port *port)
-{
-       /* TXX9-SIO can not control DTR... */
-}
-
 static void serial_txx9_initialize(struct uart_port *port)
 {
        struct uart_txx9_port *up = to_uart_txx9_port(port);
@@ -858,7 +852,6 @@ static struct uart_ops serial_txx9_pops = {
        .stop_tx        = serial_txx9_stop_tx,
        .start_tx       = serial_txx9_start_tx,
        .stop_rx        = serial_txx9_stop_rx,
-       .enable_ms      = serial_txx9_enable_ms,
        .break_ctl      = serial_txx9_break_ctl,
        .startup        = serial_txx9_startup,
        .shutdown       = serial_txx9_shutdown,