Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6] / arch / powerpc / boot / serial.c

diff --git a/arch/powerpc/boot/serial.c b/arch/powerpc/boot/serial.c
index e8de4cf59be7e25db3ddd85989e03889bf2cf24b..7fd32330a9a5ae065da03b94db95b4c8efa8fdf8 100644 (file)
--- a/arch/powerpc/boot/serial.c
+++ b/arch/powerpc/boot/serial.c
@@ -125,6 +125,8 @@ int serial_console_init(void)
 
        if (!strcmp(compat, "ns16550"))
                rc = ns16550_console_init(devp, &serial_cd);
+       else if (!strcmp(compat, "marvell,mpsc"))
+               rc = mpsc_console_init(devp, &serial_cd);
 
        /* Add other serial console driver calls here */