[SCSI] use sfoo_printk() in drivers

[safe/jmp/linux-2.6] / drivers / serial / clps711x.c

diff --git a/drivers/serial/clps711x.c b/drivers/serial/clps711x.c
index d822896..6a67e8f 100644 (file)
--- a/drivers/serial/clps711x.c
+++ b/drivers/serial/clps711x.c
@@ -98,7 +98,7 @@ static irqreturn_t clps711xuart_int_rx(int irq, void *dev_id, struct pt_regs *re
 {
        struct uart_port *port = dev_id;
        struct tty_struct *tty = port->info->tty;
-       unsigned int status, ch, flg, ignored = 0;
+       unsigned int status, ch, flg;
 
        status = clps_readl(SYSFLG(port));
        while (!(status & SYSFLG_URXFE)) {
@@ -408,7 +408,11 @@ static struct uart_port clps711x_ports[UART_NR] = {
        {
                .iobase         = SYSCON1,
                .irq            = IRQ_UTXINT1, /* IRQ_URXINT1, IRQ_UMSINT */
+#ifdef CONFIG_MP1000_90MHZ
+               .uartclk        = 4515840,
+#else
                .uartclk        = 3686400,
+#endif
                .fifosize       = 16,
                .ops            = &clps711x_pops,
                .line           = 0,
@@ -417,7 +421,11 @@ static struct uart_port clps711x_ports[UART_NR] = {
        {
                .iobase         = SYSCON2,
                .irq            = IRQ_UTXINT2, /* IRQ_URXINT2 */
+#ifdef CONFIG_MP1000_90MHZ
+               .uartclk        = 4515840,
+#else
                .uartclk        = 3686400,
+#endif
                .fifosize       = 16,
                .ops            = &clps711x_pops,
                .line           = 1,
@@ -525,7 +533,7 @@ static int __init clps711xuart_console_setup(struct console *co, char *options)
        return uart_set_options(port, co, baud, parity, bits, flow);
 }
 
-extern struct uart_driver clps711x_reg;
+static struct uart_driver clps711x_reg;
 static struct console clps711x_console = {
        .name           = "ttyCL",
        .write          = clps711xuart_console_write,
@@ -551,6 +559,7 @@ console_initcall(clps711xuart_console_init);
 static struct uart_driver clps711x_reg = {
        .driver_name            = "ttyCL",
        .dev_name               = "ttyCL",
+       .devfs_name             = "ttyCL",
        .major                  = SERIAL_CLPS711X_MAJOR,
        .minor                  = SERIAL_CLPS711X_MINOR,
        .nr                     = UART_NR,