Fix merge problems

[platform/kernel/u-boot.git] / lib_arm / bootm.c

diff --git a/lib_arm/bootm.c b/lib_arm/bootm.c
index 6b4a807..b838c37 100644 (file)
--- a/lib_arm/bootm.c
+++ b/lib_arm/bootm.c
@@ -43,9 +43,6 @@ static void setup_memory_tags (bd_t *bd);
 # endif
 static void setup_commandline_tag (bd_t *bd, char *commandline);
 
-#if 0
-static void setup_ramdisk_tag (bd_t *bd);
-#endif
 # ifdef CONFIG_INITRD_TAG
 static void setup_initrd_tag (bd_t *bd, ulong initrd_start,
                              ulong initrd_end);