From: Michal Simek <michal.simek@xilinx.com>
Date: Tue, 13 Jan 2015 14:50:35 +0000 (+0100)
Subject: ARM: zynq: Remove duplicated clk.h header
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b2a8d8f1d3b97117945e1795a583e0eb07396cfa;p=thirdparty%2Fu-boot.git

ARM: zynq: Remove duplicated clk.h header

clk.h was added by:
"Merge tag 'v2014.04' into xilinx/master-next"
(sha1: 8ffced95b73a3bfa080ecc63261a9c6de3f2fe45)

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/arch/arm/cpu/armv7/zynq/cpu.c b/arch/arm/cpu/armv7/zynq/cpu.c
index 5159c021a4a..914b1feb683 100644
--- a/arch/arm/cpu/armv7/zynq/cpu.c
+++ b/arch/arm/cpu/armv7/zynq/cpu.c
@@ -9,7 +9,6 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/hardware.h>
-#include <asm/arch/clk.h>
 
 #define ZYNQ_SILICON_VER_MASK	0xF0000000
 #define ZYNQ_SILICON_VER_SHIFT	28