From: Grant Likely <grant.likely@secretlab.ca>
Date: Tue, 2 Jan 2007 22:45:37 +0000 (-0700)
Subject: [POWERPC] Fix mpc52xx serial driver to work for arch/ppc again
X-Git-Tag: v2.6.20-rc5~35^2~8
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c98750c2eb07b0bf49db0630cb5017ede005ce14;p=linux-2.6

[POWERPC] Fix mpc52xx serial driver to work for arch/ppc again

The mpc52xx_uart_of_enumerate() function was added when adding 52xx
support to arch/powerpc, but it must not be called for arch/ppc.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index 9d11a75663..3c4b6c2437 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -789,7 +789,9 @@ static struct console mpc52xx_console = {
 static int __init
 mpc52xx_console_init(void)
 {
+#if defined(CONFIG_PPC_MERGE)
 	mpc52xx_uart_of_enumerate();
+#endif
 	register_console(&mpc52xx_console);
 	return 0;
 }