diff options
| -rw-r--r-- | arch/ppc/defconfig | 6 | ||||
| -rw-r--r-- | drivers/serial/pmac_zilog.c | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/arch/ppc/defconfig b/arch/ppc/defconfig index b934ad9eadcf..41c35249ba90 100644 --- a/arch/ppc/defconfig +++ b/arch/ppc/defconfig @@ -689,7 +689,7 @@ CONFIG_SERIO_SERPORT=y # Input Device Drivers # CONFIG_INPUT_KEYBOARD=y -CONFIG_KEYBOARD_ATKBD=y +# CONFIG_KEYBOARD_ATKBD is not set # CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_XTKBD is not set @@ -724,8 +724,8 @@ CONFIG_SERIAL_8250_NR_UARTS=4 # # Non-8250 serial port support # -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_PMACZILOG=y +# CONFIG_SERIAL_CORE is not set +# CONFIG_SERIAL_PMACZILOG is not set # CONFIG_SERIAL_PMACZILOG_CONSOLE is not set CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c index d452d4b40147..fca52e648059 100644 --- a/drivers/serial/pmac_zilog.c +++ b/drivers/serial/pmac_zilog.c @@ -1490,6 +1490,7 @@ no_dma: uap->port.ops = &pmz_pops; uap->port.type = PORT_PMAC_ZILOG; uap->port.flags = 0; + spin_lock_init(&uap->port.lock); /* Setup some valid baud rate information in the register * shadows so we don't write crap there before baud rate is @@ -1985,8 +1986,6 @@ static int __init pmz_console_init(void) /* Probe ports */ pmz_probe(); -#ifdef CONFIG_SERIAL_PMACZILOG_CONSOLE -#endif /* TODO: Autoprobe console based on OF */ /* pmz_console.index = i; */ register_console(&pmz_console); |