From dbc31f6a20d84edeec1ffbb9be0713e102610083 Mon Sep 17 00:00:00 2001
From: Michal Simek <michal.simek@xilinx.com>
Date: Mon, 11 Aug 2014 14:01:57 +0200
Subject: [PATCH] ARM: zynq: Move ps7_init() out of spl.h

Prepare for spl.h removal.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---
 arch/arm/include/asm/arch-zynq/spl.h       | 2 --
 arch/arm/include/asm/arch-zynq/sys_proto.h | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/include/asm/arch-zynq/spl.h b/arch/arm/include/asm/arch-zynq/spl.h
index 5789d28bb3..17f37cb8eb 100644
--- a/arch/arm/include/asm/arch-zynq/spl.h
+++ b/arch/arm/include/asm/arch-zynq/spl.h
@@ -6,8 +6,6 @@
 #ifndef	_ASM_ARCH_SPL_H_
 #define	_ASM_ARCH_SPL_H_
 
-extern void ps7_init(void);
-
 #define BOOT_DEVICE_NONE	0
 #define BOOT_DEVICE_RAM		1
 #define BOOT_DEVICE_SPI		2
diff --git a/arch/arm/include/asm/arch-zynq/sys_proto.h b/arch/arm/include/asm/arch-zynq/sys_proto.h
index 53c30ec6cf..89c47f3bd3 100644
--- a/arch/arm/include/asm/arch-zynq/sys_proto.h
+++ b/arch/arm/include/asm/arch-zynq/sys_proto.h
@@ -23,4 +23,6 @@ extern unsigned int zynq_get_silicon_version(void);
 extern int zynq_sdhci_init(u32 regbase);
 extern int zynq_sdhci_of_init(const void *blob);
 
+extern void ps7_init(void);
+
 #endif /* _SYS_PROTO_H_ */
-- 
2.39.5