summaryrefslogtreecommitdiff
path: root/arch/arm/plat-mxc/include/mach
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-05-16 12:29:53 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-05-16 12:46:09 +0200
commit2cfb45188a997ba4c3348e98a999b36663a4646f (patch)
tree4ba4e5f29e8b22e3ccf108fcde09d0dd0dec3a69 /arch/arm/plat-mxc/include/mach
parent1f152b48eaaf4918047e84777b01a6d687f066e9 (diff)
downloadlinux-3.10-2cfb45188a997ba4c3348e98a999b36663a4646f.tar.gz
linux-3.10-2cfb45188a997ba4c3348e98a999b36663a4646f.tar.bz2
linux-3.10-2cfb45188a997ba4c3348e98a999b36663a4646f.zip
ARM i.MX: remove now unnecessary argument from mxc_timer_init
As the timer code now does a clk_get to get its clock we don't need the struct clk argument anymore. This also changes the alternative EPIT timer to do a clk_get. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc/include/mach')
-rw-r--r--arch/arm/plat-mxc/include/mach/common.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/include/mach/common.h b/arch/arm/plat-mxc/include/mach/common.h
index 0319c4a0caf..da02540f4bd 100644
--- a/arch/arm/plat-mxc/include/mach/common.h
+++ b/arch/arm/plat-mxc/include/mach/common.h
@@ -53,8 +53,8 @@ extern void imx35_soc_init(void);
extern void imx50_soc_init(void);
extern void imx51_soc_init(void);
extern void imx53_soc_init(void);
-extern void epit_timer_init(struct clk *timer_clk, void __iomem *base, int irq);
-extern void mxc_timer_init(struct clk *timer_clk, void __iomem *, int);
+extern void epit_timer_init(void __iomem *base, int irq);
+extern void mxc_timer_init(void __iomem *, int);
extern int mx1_clocks_init(unsigned long fref);
extern int mx21_clocks_init(unsigned long lref, unsigned long fref);
extern int mx25_clocks_init(void);