Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial:
  [SERIAL] Ensure 8250_pci quirks are not marked __devinit
  [SERIAL] Convert fifosize to an unsigned int

1 files changed, 2 insertions, 1 deletions

diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index fc1104a2cfa9..058cba70818a 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -216,10 +216,11 @@ struct uart_port {
         unsigned char __iomem   *membase;               /* read/write[bwl] */
         unsigned int            irq;                    /* irq number */
         unsigned int            uartclk;                /* base uart clock */
-        unsigned char           fifosize;               /* tx fifo size */
+        unsigned int            fifosize;               /* tx fifo size */
         unsigned char           x_char;                 /* xon/xoff char */
         unsigned char           regshift;               /* reg offset shift */
         unsigned char           iotype;                 /* io access style */
+        unsigned char           unused1;
 
 #define UPIO_PORT               (0)
 #define UPIO_HUB6               (1)