Fix compile errors in SGI console drivers (linux-next tree)

[linux-2.6-omap-h63xx.git] / drivers / serial / mpsc.c

diff --git a/drivers/serial/mpsc.c b/drivers/serial/mpsc.c
index 4d643c9266578d86defb7e9a5b05a138dd161a5b..c9f53e71f252eb2833db26f645a9621f0f68f7ba 100644 (file)
--- a/drivers/serial/mpsc.c
+++ b/drivers/serial/mpsc.c
@@ -612,6 +612,7 @@ static void mpsc_hw_init(struct mpsc_port_info *pi)
 
        /* No preamble, 16x divider, low-latency, */
        writel(0x04400400, pi->mpsc_base + MPSC_MMCRH);
+       mpsc_set_baudrate(pi, pi->default_baud);
 
        if (pi->mirror_regs) {
                pi->MPSC_CHR_1_m = 0;
@@ -931,7 +932,7 @@ static int mpsc_make_ready(struct mpsc_port_info *pi)
 static int mpsc_rx_intr(struct mpsc_port_info *pi)
 {
        struct mpsc_rx_desc *rxre;
-       struct tty_struct *tty = pi->port.info->tty;
+       struct tty_struct *tty = pi->port.info->port.tty;
        u32     cmdstat, bytes_in, i;
        int     rc = 0;
        u8      *bp;
@@ -1963,6 +1964,7 @@ static struct platform_driver mpsc_driver = {
        .remove = mpsc_drv_remove,
        .driver = {
                .name   = MPSC_CTLR_NAME,
+               .owner  = THIS_MODULE,
        },
 };
 
@@ -1970,7 +1972,7 @@ static int __init mpsc_drv_init(void)
 {
        int     rc;
 
-       printk(KERN_INFO "Serial: MPSC driver $Revision: 1.00 $\n");
+       printk(KERN_INFO "Serial: MPSC driver\n");
 
        memset(mpsc_ports, 0, sizeof(mpsc_ports));
        memset(&mpsc_shared_regs, 0, sizeof(mpsc_shared_regs));
@@ -2002,7 +2004,8 @@ module_init(mpsc_drv_init);
 module_exit(mpsc_drv_exit);
 
 MODULE_AUTHOR("Mark A. Greer <mgreer@mvista.com>");
-MODULE_DESCRIPTION("Generic Marvell MPSC serial/UART driver $Revision: 1.00 $");
+MODULE_DESCRIPTION("Generic Marvell MPSC serial/UART driver");
 MODULE_VERSION(MPSC_VERSION);
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_CHARDEV_MAJOR(MPSC_MAJOR);
+MODULE_ALIAS("platform:" MPSC_CTLR_NAME);