summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mx25/mx25pdk.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-02-17 02:00:42 +0300
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-02-17 02:00:42 +0300
commitec144a81ade915b5b38adedf10e84690813ed768 (patch)
treec94b53c971ab2c39e27433267318b3c7bc86ff1b /arch/arm/mach-mx25/mx25pdk.c
parentb919ee827e048826786fd7e889a2b04f63382fe6 (diff)
parent88626272549b94310975932a9970d11a9b362a16 (diff)
downloadlinux-ec144a81ade915b5b38adedf10e84690813ed768.tar.xz
Merge commit 'origin/master' into next
Diffstat (limited to 'arch/arm/mach-mx25/mx25pdk.c')
-rw-r--r--arch/arm/mach-mx25/mx25pdk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx25/mx25pdk.c b/arch/arm/mach-mx25/mx25pdk.c
index 921bc99ea231..6f06089246eb 100644
--- a/arch/arm/mach-mx25/mx25pdk.c
+++ b/arch/arm/mach-mx25/mx25pdk.c
@@ -91,7 +91,7 @@ static void __init mx25pdk_init(void)
static void __init mx25pdk_timer_init(void)
{
- mx25_clocks_init(26000000);
+ mx25_clocks_init();
}
static struct sys_timer mx25pdk_timer = {