vserver 1.9.3

[linux-2.6.git] / drivers / serial / sunsab.c

diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c
index 494df55..4c38513 100644 (file)
--- a/drivers/serial/sunsab.c
+++ b/drivers/serial/sunsab.c
@@ -768,25 +768,6 @@ static void sunsab_convert_to_sab(struct uart_sunsab_port *up, unsigned int cfla
        writeb((readb(&up->regs->rw.ccr2) & ~0xc0) | ((ebrg >> 2) & 0xc0),
               &up->regs->rw.ccr2);
 
-       if (cflag & CRTSCTS) {
-               writeb(readb(&up->regs->rw.mode) & ~SAB82532_MODE_RTS,
-                      &up->regs->rw.mode);
-               writeb(readb(&up->regs->rw.mode) | SAB82532_MODE_FRTS,
-                      &up->regs->rw.mode);
-               writeb(readb(&up->regs->rw.mode) & ~SAB82532_MODE_FCTS,
-                      &up->regs->rw.mode);
-               up->interrupt_mask1 &= ~SAB82532_IMR1_CSC;
-               writeb(up->interrupt_mask1, &up->regs->w.imr1);
-       } else {
-               writeb(readb(&up->regs->rw.mode) | SAB82532_MODE_RTS,
-                      &up->regs->rw.mode);
-               writeb(readb(&up->regs->rw.mode) & ~SAB82532_MODE_FRTS,
-                      &up->regs->rw.mode);
-               writeb(readb(&up->regs->rw.mode) | SAB82532_MODE_FCTS,
-                      &up->regs->rw.mode);
-               up->interrupt_mask1 |= SAB82532_IMR1_CSC;
-               writeb(up->interrupt_mask1, &up->regs->w.imr1);
-       }
        writeb(readb(&up->regs->rw.mode) | SAB82532_MODE_RAC, &up->regs->rw.mode);
 
 }
@@ -940,6 +921,7 @@ static int sunsab_console_setup(struct console *con, char *options)
        writeb(up->interrupt_mask1, &up->regs->w.imr1);
 
        sunsab_convert_to_sab(up, con->cflag, 0, baud);
+       sunsab_set_mctrl(&up->port, TIOCM_DTR | TIOCM_RTS);
 
        spin_unlock_irqrestore(&up->port.lock, flags);