summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2013-01-22 23:40:06 +0000
committerTom Rini <trini@ti.com>2013-02-04 09:14:21 -0500
commite70fb539a634ab86153353aec8a9c1fede818eb0 (patch)
tree02f9532b071520d528f7f319c1c5b75f09c0cf40 /common
parent3981d02e0bbaecce9cb32c6f2366417a51c033ec (diff)
downloadu-boot-imx-e70fb539a634ab86153353aec8a9c1fede818eb0.zip
u-boot-imx-e70fb539a634ab86153353aec8a9c1fede818eb0.tar.gz
u-boot-imx-e70fb539a634ab86153353aec8a9c1fede818eb0.tar.bz2
serial: arm_dcc: Remove CONFIG_ARM_DCC_MULTI option
CONFIG_ARM_DCC_MULTI should be also removed in the patch "serial: Remove CONFIG_SERIAL_MULTI from serial drivers" (sha1: a3827250606895ec2dd4b8d867342b7cabf3692f) Because the driver defines serial_* functions which cause conflict with serial.c (multiple definition of serial_*) Removing CONFIG_SERIAL_MULTI function also require to define default_serial_console for cases where another serial driver is not available in the system. Signed-off-by: Michal Simek <michal.simek@xilinx.com> Acked-by: Marek Vasut <marex@denx.de>
Diffstat (limited to 'common')
-rw-r--r--common/stdio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/stdio.c b/common/stdio.c
index 97ff9cf..5d5117c 100644
--- a/common/stdio.c
+++ b/common/stdio.c
@@ -207,7 +207,7 @@ int stdio_init (void)
/* Initialize the list */
INIT_LIST_HEAD(&(devs.list));
-#ifdef CONFIG_ARM_DCC_MULTI
+#ifdef CONFIG_ARM_DCC
drv_arm_dcc_init ();
#endif
#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C)