Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[sfrench/cifs-2.6.git] / arch / powerpc / boot / mpsc.c

diff --git a/arch/powerpc/boot/mpsc.c b/arch/powerpc/boot/mpsc.c
index f1c0e965e5ceb74acdb850c2a8b8c67aab0a66d5..425ad88cce8d90a435b22a83876c06b0263716f7 100644 (file)
--- a/arch/powerpc/boot/mpsc.c
+++ b/arch/powerpc/boot/mpsc.c
@@ -17,7 +17,6 @@
 #include "io.h"
 #include "ops.h"
 
-extern void udelay(long delay);
 
 #define MPSC_CHR_1             0x000c
 
@@ -142,7 +141,7 @@ int mpsc_console_init(void *devp, struct serial_console_data *scdp)
        if (mpscintr_base == NULL)
                goto err_out;
 
-       n = getprop(devp, "block-index", &v, sizeof(v));
+       n = getprop(devp, "cell-index", &v, sizeof(v));
        if (n != sizeof(v))
                goto err_out;
        reg_set = (int)v;