diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-01 14:26:04 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-01 14:26:04 -0700 |
| commit | 5c008d7029fcd12a9a54fa618781b71353f6c4bd (patch) | |
| tree | 666c42d0a97664131b9f62b886c51cd671066f9d /drivers/clk/mxs/clk-imx23.c | |
| parent | 5d3a0a95868a9669816da193bb284121df9031c8 (diff) | |
| parent | 36246a820075b65907112891b77ff7915fdb06a5 (diff) | |
Merge branch 'next/soc2' into HEAD
Diffstat (limited to 'drivers/clk/mxs/clk-imx23.c')
| -rw-r--r-- | drivers/clk/mxs/clk-imx23.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/mxs/clk-imx23.c b/drivers/clk/mxs/clk-imx23.c index 9f6d15546cb..f00dffb9ad6 100644 --- a/drivers/clk/mxs/clk-imx23.c +++ b/drivers/clk/mxs/clk-imx23.c @@ -165,7 +165,7 @@ int __init mx23_clocks_init(void) for (i = 0; i < ARRAY_SIZE(clks_init_on); i++) clk_prepare_enable(clks[clks_init_on[i]]); - mxs_timer_init(MX23_INT_TIMER0); + mxs_timer_init(); return 0; } |