Merge branch 'next'

Signed-off-by: Tom Rini <[email protected]>

1 files changed, 0 insertions, 12 deletions

diff --git a/common/stdio.c b/common/stdio.c
index 894cbd3fb44..010bf576af0 100644
--- a/common/stdio.c
+++ b/common/stdio.c
@@ -293,18 +293,6 @@ int stdio_deregister_dev(struct stdio_dev *dev, int force)
 
 int stdio_init_tables(void)
 {
-#if defined(CONFIG_NEEDS_MANUAL_RELOC)
-	/* already relocated for current ARM implementation */
-	ulong relocation_offset = gd->reloc_off;
-	int i;
-
-	/* relocate device name pointers */
-	for (i = 0; i < (sizeof (stdio_names) / sizeof (char *)); ++i) {
-		stdio_names[i] = (char *) (((ulong) stdio_names[i]) +
-						relocation_offset);
-	}
-#endif /* CONFIG_NEEDS_MANUAL_RELOC */
-
 	/* Initialize the list */
 	INIT_LIST_HEAD(&devs.list);