Merge branch 'master' of git://www.denx.de/git/u-boot-sunxi

[u-boot] / arch / arm / mach-uniphier / memconf / memconf-sld3.c

diff --git a/arch/arm/mach-uniphier/memconf/memconf-sld3.c b/arch/arm/mach-uniphier/memconf/memconf-sld3.c
index 6fdf910895765b6b7fbfbe06f7620926cdd77095..948f82c0504acc9f1971ebed6dacdc54ed84949b 100644 (file)
--- a/arch/arm/mach-uniphier/memconf/memconf-sld3.c
+++ b/arch/arm/mach-uniphier/memconf/memconf-sld3.c
@@ -12,7 +12,7 @@
 #include "../init.h"
 #include "../sg-regs.h"
 
-int ph1_sld3_memconf_init(const struct uniphier_board_data *bd)
+int uniphier_sld3_memconf_init(const struct uniphier_board_data *bd)
 {
        u32 tmp;
        unsigned long size_per_word;