X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=drivers%2Fserial%2Fmpc52xx_uart.c;h=3c4b6c24371254b1a8a6bcfa27fa922a6069fc9d;hb=85f4544fbf02f60993c76f5b92517a87f220472d;hp=9d11a75663e668462ca871851ac647529d9d8ad2;hpb=a57bf8a4f23cca2b5be5446649bbe22d1440af5d;p=deliverable%2Flinux.git

diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index 9d11a75663e6..3c4b6c243712 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;
 }