From 821ca6a2df8239f076b7c38d568b6a5acc2bfe17 Mon Sep 17 00:00:00 2001
From: Grant Likely <grant.likely@secretlab.ca>
Date: Tue, 2 Jan 2007 15:45:37 -0700
Subject: [PATCH] --- yaml --- r: 45367 b: refs/heads/master c:
 c98750c2eb07b0bf49db0630cb5017ede005ce14 h: refs/heads/master i:   45365:
 d82816a8979f199cb3954c06aa1278a1852cf7ab   45363:
 15a7b1ae2f4782ffb4615924c439c0c14c69e998   45359:
 f114f5a81a8347794a32c233f174edbe178006ac v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/serial/mpc52xx_uart.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f2c707665c43..0d68771fee7f 100644
--- 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
index 9d11a75663e6..3c4b6c243712 100644
--- 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;
 }