Merge branch 'sg' of git://git.kernel.dk/linux-2.6-block

[linux-2.6-omap-h63xx.git] / drivers / char / serial167.c

diff --git a/drivers/char/serial167.c b/drivers/char/serial167.c
index 5fd314adc1f28d864805bea180d2f87a77d06741..f1497cecffd815248a7eb374a0346e4e8fb88e2f 100644 (file)
--- a/drivers/char/serial167.c
+++ b/drivers/char/serial167.c
@@ -1892,7 +1892,7 @@ block_til_ready(struct tty_struct *tty, struct file *filp,
 #endif
                    schedule();
        }
-       current->state = TASK_RUNNING;
+       __set_current_state(TASK_RUNNING);
        remove_wait_queue(&info->open_wait, &wait);
        if (!tty_hung_up_p(filp)) {
                info->count++;
@@ -2573,16 +2573,10 @@ static struct tty_driver *serial167_console_device(struct console *c,
        return cy_serial_driver;
 }
 
-static int __init serial167_console_setup(struct console *co, char *options)
-{
-       return 0;
-}
-
 static struct console sercons = {
        .name = "ttyS",
        .write = serial167_console_write,
        .device = serial167_console_device,
-       .setup = serial167_console_setup,
        .flags = CON_PRINTBUFFER,
        .index = -1,
 };