---

yaml --- r: 45367 b: refs/heads/master c: c98750c h: refs/heads/master i: 45365: d82816a 45363: 15a7b1a 45359: f114f5a v: v3
git-mirror · Jan 9, 2007 · 821ca6a · 821ca6a
1 parent 8880597
commit 821ca6a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b3a6f4ab98809c93ac57fa5e11dff0575046efc
+refs/heads/master: c98750c2eb07b0bf49db0630cb5017ede005ce14
diff --git a/trunk/drivers/serial/mpc52xx_uart.c b/trunk/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;
 }