- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix.

[linux-flexiantxendom0-3.2.10.git] / arch / powerpc / boot / serial.c

diff --git a/arch/powerpc/boot/serial.c b/arch/powerpc/boot/serial.c
index e8de4cf..7fd3233 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 */