diff options
author | Tom Rini <trini@ti.com> | 2014-09-23 15:21:43 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-09-23 15:21:43 -0400 |
commit | 47d3debe1ab8315dc9ade22279e02f60eceda25b (patch) | |
tree | 705c9aef9c969074339484a9a5adaa3f8ca43fcd /drivers/serial/serial-uclass.c | |
parent | 692c223518023b47579fbf1142a8f639cbedb5b0 (diff) | |
parent | cae025aab3e8ea8ad455cce8b0e4647401cdd091 (diff) |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'drivers/serial/serial-uclass.c')
-rw-r--r-- | drivers/serial/serial-uclass.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c index d04104e747..1ac943f692 100644 --- 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 |