]> err.no Git - linux-2.6/blobdiff - drivers/serial/serial_core.c
pci/irq: restore mask_bits in msi shutdown -v3
[linux-2.6] / drivers / serial / serial_core.c
index 4d7eecbead9b08e9a9b039996dfd12f22668476e..a9ca03ead3e5dc0337b9b7a1eecdf8bb4ce1569a 100644 (file)
@@ -1771,7 +1771,7 @@ static int uart_read_proc(char *page, char **start, off_t off,
 }
 #endif
 
-#ifdef CONFIG_SERIAL_CORE_CONSOLE
+#if defined(CONFIG_SERIAL_CORE_CONSOLE) || defined(CONFIG_CONSOLE_POLL)
 /*
  *     uart_console_write - write a console message to a serial port
  *     @port: the port to write the message
@@ -2422,7 +2422,7 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *port)
         */
        tty_dev = tty_register_device(drv->tty_driver, port->line, port->dev);
        if (likely(!IS_ERR(tty_dev))) {
-               device_can_wakeup(tty_dev) = 1;
+               device_init_wakeup(tty_dev, 1);
                device_set_wakeup_enable(tty_dev, 0);
        } else
                printk(KERN_ERR "Cannot register tty device on line %d\n",