From: Shenwei Wang <shenwei.wang@freescale.com>
Date: Wed, 29 Apr 2015 21:18:37 +0000 (-0500)
Subject: ARM: imx: Remove the duplicated function declaration
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=d0185d96c6c61871f090fe51116b6d81b3dd74b9;p=deliverable%2Flinux.git

ARM: imx: Remove the duplicated function declaration

Removed the duplicated function declaration of mxc_timer_init
which was already declared in drivers/clk/imx/clk.h.

Signed-off-by: Shenwei Wang <shenwei.wang@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---

diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h
index fbd86f1b7f3b..1f800b9a63f5 100644
--- a/arch/arm/mach-imx/common.h
+++ b/arch/arm/mach-imx/common.h
@@ -44,7 +44,6 @@ void imx27_soc_init(void);
 void imx31_soc_init(void);
 void imx35_soc_init(void);
 void epit_timer_init(void __iomem *base, int irq);
-void mxc_timer_init(unsigned long, int);
 int mx1_clocks_init(unsigned long fref);
 int mx21_clocks_init(unsigned long lref, unsigned long fref);
 int mx27_clocks_init(unsigned long fref);