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

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

diff --git a/arch/arm/mach-uniphier/reset.c b/arch/arm/mach-uniphier/reset.c
index 50d1fed64798ff8bcb58cc50315de47962d29927..b5825bc0c7f134a241db24d0724f6ce46a5cd0b3 100644 (file)
--- a/arch/arm/mach-uniphier/reset.c
+++ b/arch/arm/mach-uniphier/reset.c
@@ -1,13 +1,13 @@
 /*
- * Copyright (C) 2012-2014 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ * Copyright (C) 2012-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
-#include <asm/io.h>
-#include <asm/arch/sc-regs.h>
+#include <linux/io.h>
+
+#include "sc-regs.h"
 
 void reset_cpu(unsigned long ignored)
 {