Pull release into acpica branch

[karo-tx-linux.git] / drivers / serial / amba-pl010.c

diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c
index 679e678c7e6a158e0b6e25aaf5ef383cae346f08..3490022e9fdc7e923d265eb06e635f4dc32e5026 100644 (file)
--- a/drivers/serial/amba-pl010.c
+++ b/drivers/serial/amba-pl010.c
@@ -47,11 +47,12 @@
 #include <linux/tty_flip.h>
 #include <linux/serial_core.h>
 #include <linux/serial.h>
+#include <linux/amba/bus.h>
+#include <linux/amba/serial.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/hardware/amba.h>
-#include <asm/hardware/amba_serial.h>
+#include <asm/hardware.h>
 
 #define UART_NR                2
 
@@ -153,15 +154,6 @@ pl010_rx_chars(struct uart_port *port)
 
        status = UART_GET_FR(port);
        while (UART_RX_DATA(status) && max_count--) {
-               if (tty->flip.count >= TTY_FLIPBUF_SIZE) {
-                       if (tty->low_latency)
-                               tty_flip_buffer_push(tty);
-                       /*
-                        * If this failed then we will throw away the
-                        * bytes but must do so to clear interrupts.
-                        */
-               }
-
                ch = UART_GET_CHAR(port);
                flag = TTY_NORMAL;