Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/paulus/ppc64-2.6

[~andy/linux] / drivers / firmware / pcdp.c

diff --git a/drivers/firmware/pcdp.c b/drivers/firmware/pcdp.c
index df1b721154d2728504541e023a43701db5e6d2f5..839b44a7e08bea58dba9ad8e1e459dff30c44afe 100644 (file)
--- a/drivers/firmware/pcdp.c
+++ b/drivers/firmware/pcdp.c
@@ -23,12 +23,15 @@ setup_serial_console(struct pcdp_uart *uart)
 {
 #ifdef CONFIG_SERIAL_8250_CONSOLE
        int mmio;
-       static char options[64];
+       static char options[64], *p = options;
 
        mmio = (uart->addr.address_space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY);
-       snprintf(options, sizeof(options), "console=uart,%s,0x%lx,%lun%d",
-               mmio ? "mmio" : "io", uart->addr.address, uart->baud,
-               uart->bits ? uart->bits : 8);
+       p += sprintf(p, "console=uart,%s,0x%lx",
+               mmio ? "mmio" : "io", uart->addr.address);
+       if (uart->baud)
+               p += sprintf(p, ",%lu", uart->baud);
+       if (uart->bits)
+               p += sprintf(p, "n%d", uart->bits);
 
        return early_serial_console_init(options);
 #else