From: Remi Machet Date: Mon, 21 Apr 2008 21:02:56 +0000 (+1000) Subject: [POWERPC] Fix mv64x60 early console code to use cell-index property X-Git-Tag: v2.6.26-rc1~1055^2~35 X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=df40a57ef16219e5dee75238559960b1dd459c65;p=safe%2Fjmp%2Flinux-2.6 [POWERPC] Fix mv64x60 early console code to use cell-index property The MPSC driver and prpmc2800.dts have been modified to use property 'cell-index' as the serial port number, but the early serial console driver for the mv64x60 has not been modified to use this new property. This fixes it. Signed-off-by: Remi Machet (rmachet@slac.stanford.edu) Acked-by: Dale Farnsworth Signed-off-by: Paul Mackerras --- diff --git a/arch/powerpc/sysdev/mv64x60_udbg.c b/arch/powerpc/sysdev/mv64x60_udbg.c index ccdb3b0..2792dc8 100644 --- a/arch/powerpc/sysdev/mv64x60_udbg.c +++ b/arch/powerpc/sysdev/mv64x60_udbg.c @@ -94,7 +94,7 @@ static void mv64x60_udbg_init(void) if (!np) return; - block_index = of_get_property(np, "block-index", NULL); + block_index = of_get_property(np, "cell-index", NULL); if (!block_index) goto error;