summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2015-02-09 11:44:46 -0500
committerTom Rini <trini@ti.com>2015-02-09 11:44:46 -0500
commita4fb5df214c7e8d5bc949c1068d92252f105427a (patch)
treebe1d6e906ba602562affae768880b96ea39e2642 /arch/arm
parent10918c03a9761db3ef8b57ca46a20d39e0be41e6 (diff)
parent7f33899221e4235900760add69ffbb5f66f1229d (diff)
downloadblackbird-obmc-uboot-a4fb5df214c7e8d5bc949c1068d92252f105427a.tar.gz
blackbird-obmc-uboot-a4fb5df214c7e8d5bc949c1068d92252f105427a.zip
Merge branch 'microblaze' of git://git.denx.de/u-boot-microblaze
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/include/asm/u-boot-arm.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/include/asm/u-boot-arm.h b/arch/arm/include/asm/u-boot-arm.h
index f97f3dd149..414042d403 100644
--- a/arch/arm/include/asm/u-boot-arm.h
+++ b/arch/arm/include/asm/u-boot-arm.h
@@ -36,7 +36,6 @@ int arch_early_init_r(void);
/* board/.../... */
int board_init(void);
-int dram_init (void);
void dram_init_banksize (void);
/* cpu/.../interrupt.c */
OpenPOWER on IntegriCloud