Prepare v2013.07-rc1

[karo-tx-uboot.git] / common / iomux.c

diff --git a/common/iomux.c b/common/iomux.c
index 91d98e98358ca3dee517d96c507fa43adb8206dc..6a757041f6af98a9052aa90313260a8d0ae6c5ea 100644 (file)
--- a/common/iomux.c
+++ b/common/iomux.c
@@ -135,18 +135,6 @@ int iomux_doenv(const int console, const char *arg)
                 */
                if (console_assign(console, start[j]) < 0)
                        continue;
-#ifdef CONFIG_SERIAL_MULTI
-               /*
-                * This was taken from common/cmd_nvedit.c.
-                * This will never work because serial_assign() returns
-                * 1 upon error, not -1.
-                * This would almost always return an error anyway because
-                * serial_assign() expects the name of a serial device, like
-                * serial_smc, but the user generally only wants to set serial.
-                */
-               if (serial_assign(start[j]) < 0)
-                       continue;
-#endif
                cons_set[cs_idx++] = dev;
        }
        free(console_args);