Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / drivers / serial / serial.c

diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index 336ff357211908161f341107d1817ef40ed9400b..35dc61e020c04b5e0efc37df211e28fff8f2a67d 100644 (file)
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -159,6 +159,7 @@ serial_initfunc(pl01x_serial_initialize);
 serial_initfunc(s3c44b0_serial_initialize);
 serial_initfunc(sa1100_serial_initialize);
 serial_initfunc(sh_serial_initialize);
 serial_initfunc(s3c44b0_serial_initialize);
 serial_initfunc(sa1100_serial_initialize);
 serial_initfunc(sh_serial_initialize);

+serial_initfunc(arm_dcc_initialize);

 serial_initfunc(mxs_auart_initialize);
 
 /**
 serial_initfunc(mxs_auart_initialize);
 
 /**


@@ -252,6 +253,7 @@ void serial_initialize(void)
        s3c44b0_serial_initialize();
        sa1100_serial_initialize();
        sh_serial_initialize();
        s3c44b0_serial_initialize();
        sa1100_serial_initialize();
        sh_serial_initialize();

+       arm_dcc_initialize();

        mxs_auart_initialize();
 
        serial_assign(default_serial_console()->name);
        mxs_auart_initialize();
 
        serial_assign(default_serial_console()->name);