Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

[u-boot] / drivers / serial / serial-uclass.c

diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index d04104e74700108bf1df0cc232481336c6db1259..1ac943f692882700701d990e3403276334b941b0 100644 (file)
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -25,6 +25,7 @@ struct udevice *cur_dev __attribute__ ((section(".data")));
 
 static void serial_find_console_or_panic(void)
 {
+#ifdef CONFIG_OF_CONTROL
        int node;
 
        /* Check for a chosen console */
@@ -44,7 +45,7 @@ static void serial_find_console_or_panic(void)
                        return;
                cur_dev = NULL;
        }
-
+#endif
        /*
         * Failing that, get the device with sequence number 0, or in extremis
         * just the first serial device we can find. But we insist on having