VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / drivers / parisc / superio.c

diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c
index ad78115..6357ec1 100644 (file)
--- a/drivers/parisc/superio.c
+++ b/drivers/parisc/superio.c
@@ -419,8 +419,10 @@ superio_serial_init(void)
 {
 #ifdef CONFIG_SERIAL_8250
        int retval;
+#ifdef CONFIG_SERIAL_8250_CONSOLE
        extern void serial8250_console_init(void); /* drivers/serial/8250.c */
-       
+#endif        
+        
        if (!sio_dev.irq_region)
                return; /* superio not present */
 
@@ -438,8 +440,10 @@ superio_serial_init(void)
                return;
        }
 
+#ifdef CONFIG_SERIAL_8250_CONSOLE
        serial8250_console_init();
-
+#endif
+        
        serial[1].iobase = sio_dev.sp2_base;
        serial[1].irq = sio_dev.irq_region->data.irqbase + SP2_IRQ;
        retval = early_serial_setup(&serial[1]);