summaryrefslogtreecommitdiff
path: root/lib_arm/bootm.c
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2008-08-06 14:05:38 +0200
committerStefan Roese <sr@denx.de>2008-08-06 14:05:38 +0200
commitf2302d4430e7f3f48308d6a585320fe96af8afbd (patch)
treeeec529fa883a32b0bd44f65aa46a454dc5c69688 /lib_arm/bootm.c
parent9246f5ecfd353ae297a02ffd5328402acf16c9dd (diff)
Fix merge problems
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'lib_arm/bootm.c')
-rw-r--r--lib_arm/bootm.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/lib_arm/bootm.c b/lib_arm/bootm.c
index 6b4a80723..b838c374a 100644
--- 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);