Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / tty / serial / cpm_uart / cpm_uart.h

diff --git a/drivers/serial/cpm_uart/cpm_uart.h b/drivers/tty/serial/cpm_uart/cpm_uart.h
similarity index 96%
rename from drivers/serial/cpm_uart/cpm_uart.h
rename to drivers/tty/serial/cpm_uart/cpm_uart.h
index 7274b527a3c1737a248cdafb77edb0fd17c14bb9..b754dcf0fda5317624da6804dee392fa3b487a9a 100644 (file)
--- a/drivers/serial/cpm_uart/cpm_uart.h
+++ b/drivers/tty/serial/cpm_uart/cpm_uart.h
@@ -76,18 +76,12 @@ struct uart_cpm_port {
        unsigned char           *tx_buf;
        unsigned char           *rx_buf;
        u32                     flags;
-       void                    (*set_lineif)(struct uart_cpm_port *);
        struct clk              *clk;
        u8                      brg;
        uint                     dp_addr;
        void                    *mem_addr;
        dma_addr_t               dma_addr;
        u32                     mem_size;
-       /* helpers */
-       int                      baud;
-       int                      bits;
-       /* Keep track of 'odd' SMC2 wirings */
-       int                     is_portb;
        /* wait on close if needed */
        int                     wait_closing;
        /* value to combine with opcode to form cpm command */