vserver 2.0-pre4

[linux-2.6.git] / include / linux / serialP.h

diff --git a/include/linux/serialP.h b/include/linux/serialP.h
index 93f7492..042d92a 100644 (file)
--- a/include/linux/serialP.h
+++ b/include/linux/serialP.h
@@ -42,8 +42,8 @@ struct serial_state {
        int     count;
        u8      *iomem_base;
        u16     iomem_reg_shift;
-       unsigned short  close_delay;
-       unsigned short  closing_wait; /* time to wait before closing */
+       unsigned int    close_delay;
+       unsigned int    closing_wait; /* time to wait before closing */
        struct async_icount     icount; 
        int     io_type;
        struct async_struct *info;
@@ -64,8 +64,8 @@ struct async_struct {
        int                     quot;
        int                     x_char; /* xon/xoff character */
        int                     close_delay;
-       unsigned short          closing_wait;
-       unsigned short          closing_wait2; /* obsolete */
+       unsigned int            closing_wait;
+       unsigned int            closing_wait2; /* obsolete */
        int                     IER;    /* Interrupt Enable Register */
        int                     MCR;    /* Modem control register */
        int                     LCR;    /* Line control register */
@@ -130,6 +130,13 @@ struct rs_multiport_struct {
  * reason (mips != alpha!)
  */
 #define ALPHA_KLUDGE_MCR  (UART_MCR_OUT2 | UART_MCR_OUT1)
+#elif defined(CONFIG_SBC8560)
+/*
+ * WindRiver did something similarly broken on their SBC8560 board. The
+ * UART tristates its IRQ output while OUT2 is clear, but they pulled
+ * the interrupt line _up_ instead of down, so if we register the IRQ
+ * while the UART is in that state, we die in an IRQ storm. */
+#define ALPHA_KLUDGE_MCR (UART_MCR_OUT2)
 #else
 #define ALPHA_KLUDGE_MCR 0
 #endif