Merge head 'drm-via' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6

[linux-2.6] / include / linux / serial_8250.h

diff --git a/include/linux/serial_8250.h b/include/linux/serial_8250.h
index 823181af6ddfbfec26e3c42af6c19599f8d69745..3e3c1fa35b06cc2eafa509f2cf1d2b4dcf04e7e4 100644 (file)
--- a/include/linux/serial_8250.h
+++ b/include/linux/serial_8250.h
@@ -22,6 +22,7 @@ struct plat_serial8250_port {
        unsigned int    uartclk;        /* UART clock rate */
        unsigned char   regshift;       /* register shift */
        unsigned char   iotype;         /* UPIO_* */
+       unsigned char   hub6;
        unsigned int    flags;          /* UPF_* flags */
 };