diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-05-16 12:29:53 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-05-16 12:46:09 +0200 |
commit | 2cfb45188a997ba4c3348e98a999b36663a4646f (patch) | |
tree | 4ba4e5f29e8b22e3ccf108fcde09d0dd0dec3a69 /arch/arm/mach-imx/clk-imx21.c | |
parent | 1f152b48eaaf4918047e84777b01a6d687f066e9 (diff) | |
download | linux-2cfb45188a997ba4c3348e98a999b36663a4646f.tar.gz linux-2cfb45188a997ba4c3348e98a999b36663a4646f.tar.bz2 linux-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/mach-imx/clk-imx21.c')
-rw-r--r-- | arch/arm/mach-imx/clk-imx21.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/clk-imx21.c b/arch/arm/mach-imx/clk-imx21.c index 4e4f384ee8dd..ea13e61bd5f3 100644 --- a/arch/arm/mach-imx/clk-imx21.c +++ b/arch/arm/mach-imx/clk-imx21.c @@ -180,7 +180,7 @@ int __init mx21_clocks_init(unsigned long lref, unsigned long href) clk_register_clkdev(clk[sdhc1_ipg_gate], "sdhc1", NULL); clk_register_clkdev(clk[sdhc2_ipg_gate], "sdhc2", NULL); - mxc_timer_init(NULL, MX21_IO_ADDRESS(MX21_GPT1_BASE_ADDR), - MX21_INT_GPT1); + mxc_timer_init(MX21_IO_ADDRESS(MX21_GPT1_BASE_ADDR), MX21_INT_GPT1); + return 0; } |