diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-01-29 04:43:17 -0500 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-01-29 04:43:17 -0500 |
| commit | 4cb73288b195dc04c1f604c38bd4ebd2081db9fa (patch) | |
| tree | 7aa025e7a48994aaaeec659b46d246c224a42a25 /arch/arm/mach-mx25/mx25pdk.c | |
| parent | 70c91a384918736afee13104eea059cc7c8728a1 (diff) | |
| parent | 66ddfc62caec65a25fd5a8b20f535a2958ee94e6 (diff) | |
Merge branch 'mxc-rc' into mxc-master
Diffstat (limited to 'arch/arm/mach-mx25/mx25pdk.c')
| -rw-r--r-- | arch/arm/mach-mx25/mx25pdk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx25/mx25pdk.c b/arch/arm/mach-mx25/mx25pdk.c index c8b1d3b9d010..232f9caa7dd9 100644 --- a/arch/arm/mach-mx25/mx25pdk.c +++ b/arch/arm/mach-mx25/mx25pdk.c | |||
| @@ -98,7 +98,7 @@ static void __init mx25pdk_init(void) | |||
| 98 | 98 | ||
| 99 | static void __init mx25pdk_timer_init(void) | 99 | static void __init mx25pdk_timer_init(void) |
| 100 | { | 100 | { |
| 101 | mx25_clocks_init(26000000); | 101 | mx25_clocks_init(); |
| 102 | } | 102 | } |
| 103 | 103 | ||
| 104 | static struct sys_timer mx25pdk_timer = { | 104 | static struct sys_timer mx25pdk_timer = { |