[MTD] [NAND] Fix checkpatch warnings which showed up when atmel_nand.c moved

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

diff --git a/arch/powerpc/boot/serial.c b/arch/powerpc/boot/serial.c
index 3ce7f651ab34bc5a43e35a9dcd66b5c2ddd92c21..8b3607cb53fb158075a41d5af9845eb1b2bc9e32 100644 (file)
--- a/arch/powerpc/boot/serial.c
+++ b/arch/powerpc/boot/serial.c
@@ -19,8 +19,6 @@
 #include "io.h"
 #include "ops.h"
 
-extern void udelay(long delay);
-
 static int serial_open(void)
 {
        struct serial_console_data *scdp = console_ops.data;
@@ -121,8 +119,18 @@ int serial_console_init(void)
 
        if (dt_is_compatible(devp, "ns16550"))
                rc = ns16550_console_init(devp, &serial_cd);
-       else if (dt_is_compatible(devp, "marvell,mpsc"))
+       else if (dt_is_compatible(devp, "marvell,mv64360-mpsc"))
                rc = mpsc_console_init(devp, &serial_cd);
+       else if (dt_is_compatible(devp, "fsl,cpm1-scc-uart") ||
+                dt_is_compatible(devp, "fsl,cpm1-smc-uart") ||
+                dt_is_compatible(devp, "fsl,cpm2-scc-uart") ||
+                dt_is_compatible(devp, "fsl,cpm2-smc-uart"))
+               rc = cpm_console_init(devp, &serial_cd);
+       else if (dt_is_compatible(devp, "fsl,mpc5200-psc-uart"))
+               rc = mpc5200_psc_console_init(devp, &serial_cd);
+       else if (dt_is_compatible(devp, "xlnx,opb-uartlite-1.00.b") ||
+                dt_is_compatible(devp, "xlnx,xps-uartlite-1.00.a"))
+               rc = uartlite_console_init(devp, &serial_cd);
 
        /* Add other serial console driver calls here */