diff options
| author | Russell King | 2010-03-08 21:21:04 +0100 |
|---|---|---|
| committer | Russell King | 2010-03-08 21:21:04 +0100 |
| commit | 988addf82e4c03739375279de73929580a2d4a6a (patch) | |
| tree | 989ae1cd4e264bbad80c65f04480486246e7b9f3 /arch/arm/mach-mx25/clock.c | |
| parent | Merge branch 'for-rmk/samsung6' of git://git.fluff.org/bjdooks/linux into dev... (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/amit/virtio-console (diff) | |
| download | kernel-qcow2-linux-988addf82e4c03739375279de73929580a2d4a6a.tar.gz kernel-qcow2-linux-988addf82e4c03739375279de73929580a2d4a6a.tar.xz kernel-qcow2-linux-988addf82e4c03739375279de73929580a2d4a6a.zip | |
Merge branch 'origin' into devel-stable
Conflicts:
arch/arm/mach-mx2/devices.c
arch/arm/mach-mx2/devices.h
sound/soc/pxa/pxa-ssp.c
Diffstat (limited to 'arch/arm/mach-mx25/clock.c')
| -rw-r--r-- | arch/arm/mach-mx25/clock.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-mx25/clock.c b/arch/arm/mach-mx25/clock.c index 56bf958d8c34..155014993b13 100644 --- a/arch/arm/mach-mx25/clock.c +++ b/arch/arm/mach-mx25/clock.c @@ -229,10 +229,7 @@ static struct clk_lookup lookups[] = { int __init mx25_clocks_init(void) { - int i; - - for (i = 0; i < ARRAY_SIZE(lookups); i++) - clkdev_add(&lookups[i]); + clkdev_add_table(lookups, ARRAY_SIZE(lookups)); /* Turn off all clocks except the ones we need to survive, namely: * EMI, GPIO1-3 (CCM_CGCR1[18:16]), GPT1, IOMUXC (CCM_CGCR1[27]), IIM, |