nfsd: Revert "svcrpc: take advantage of tcp autotuning"

[safe/jmp/linux-2.6] / drivers / serial / sb1250-duart.c

diff --git a/drivers/serial/sb1250-duart.c b/drivers/serial/sb1250-duart.c
index 2012537..a4fb343 100644 (file)
--- a/drivers/serial/sb1250-duart.c
+++ b/drivers/serial/sb1250-duart.c
@@ -58,6 +58,12 @@
 #define SBD_CTRLREGS(line)     A_BCM1480_DUART_CTRLREG((line), 0)
 #define SBD_INT(line)          (K_BCM1480_INT_UART_0 + (line))
 
+#define DUART_CHANREG_SPACING  BCM1480_DUART_CHANREG_SPACING
+
+#define R_DUART_IMRREG(line)   R_BCM1480_DUART_IMRREG(line)
+#define R_DUART_INCHREG(line)  R_BCM1480_DUART_INCHREG(line)
+#define R_DUART_ISRREG(line)   R_BCM1480_DUART_ISRREG(line)
+
 #elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)
 #include <asm/sibyte/sb1250_regs.h>
 #include <asm/sibyte/sb1250_int.h>
@@ -378,7 +384,7 @@ static void sbd_receive_chars(struct sbd_port *sport)
                uart_insert_char(uport, status, M_DUART_OVRUN_ERR, ch, flag);
        }
 
-       tty_flip_buffer_push(uport->info->tty);
+       tty_flip_buffer_push(uport->info->port.tty);
 }
 
 static void sbd_transmit_chars(struct sbd_port *sport)
@@ -918,7 +924,7 @@ console_initcall(sbd_serial_console_init);
 
 static struct uart_driver sbd_reg = {
        .owner          = THIS_MODULE,
-       .driver_name    = "serial",
+       .driver_name    = "sb1250_duart",
        .dev_name       = "duart",
        .major          = TTY_MAJOR,
        .minor          = SB1250_DUART_MINOR_BASE,