HID: GEYSER4_ISO needs quirk

[linux-2.6-omap-h63xx.git] / drivers / serial / mpc52xx_uart.c

diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index 9d11a75663e668462ca871851ac647529d9d8ad2..3c4b6c24371254b1a8a6bcfa27fa922a6069fc9d 100644 (file)
--- 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;
 }