X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=arch%2Farm%2Fmach-uniphier%2Fmemconf.c;h=59ed0b5dd8f4dc7c2a662da2ed6b67087c309863;hb=fffde77e130897124e76108cdcb0ff9246a90a78;hp=bf3c177ed9ea6218e6285ce42d9f0a11cc4246a2;hpb=57c6941b433722ab83a50dab35b8ab5a0954942a;p=u-boot

diff --git a/arch/arm/mach-uniphier/memconf.c b/arch/arm/mach-uniphier/memconf.c
index bf3c177ed9..59ed0b5dd8 100644
--- a/arch/arm/mach-uniphier/memconf.c
+++ b/arch/arm/mach-uniphier/memconf.c
@@ -1,13 +1,12 @@
 /*
- * Copyright (C) 2011-2015 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
 #include <linux/sizes.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/sg-regs.h>
 
 static inline u32 sg_memconf_val_ch0(unsigned long size, int num)