diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-06-21 00:44:42 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-06-21 00:44:42 -0400 |
| commit | 7b98cf0cf4e8798b9e7435f966ed0d90a2a925de (patch) | |
| tree | a5d2a80f121a5c854773ddc85b1d9cbd6b840861 /arch/arm/mach-imx/clk-imx35.c | |
| parent | e1eaf354528ceb002c8e2840a55c44cd76aaaed8 (diff) | |
| parent | 06d5631f56460917af3d9417ef63811cf0cad9ce (diff) | |
Merge branch 'common/pfc' into sh-latest
Diffstat (limited to 'arch/arm/mach-imx/clk-imx35.c')
| -rw-r--r-- | arch/arm/mach-imx/clk-imx35.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/clk-imx35.c b/arch/arm/mach-imx/clk-imx35.c index a9e60bf7dd75..920a8cc42726 100644 --- a/arch/arm/mach-imx/clk-imx35.c +++ b/arch/arm/mach-imx/clk-imx35.c | |||
| @@ -267,11 +267,9 @@ int __init mx35_clocks_init() | |||
| 267 | imx_print_silicon_rev("i.MX35", mx35_revision()); | 267 | imx_print_silicon_rev("i.MX35", mx35_revision()); |
| 268 | 268 | ||
| 269 | #ifdef CONFIG_MXC_USE_EPIT | 269 | #ifdef CONFIG_MXC_USE_EPIT |
| 270 | epit_timer_init(&epit1_clk, | 270 | epit_timer_init(MX35_IO_ADDRESS(MX35_EPIT1_BASE_ADDR), MX35_INT_EPIT1); |
| 271 | MX35_IO_ADDRESS(MX35_EPIT1_BASE_ADDR), MX35_INT_EPIT1); | ||
| 272 | #else | 271 | #else |
| 273 | mxc_timer_init(NULL, MX35_IO_ADDRESS(MX35_GPT1_BASE_ADDR), | 272 | mxc_timer_init(MX35_IO_ADDRESS(MX35_GPT1_BASE_ADDR), MX35_INT_GPT); |
| 274 | MX35_INT_GPT); | ||
| 275 | #endif | 273 | #endif |
| 276 | 274 | ||
| 277 | return 0; | 275 | return 0; |