diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 15:21:04 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 15:21:04 -0500 |
| commit | 988addf82e4c03739375279de73929580a2d4a6a (patch) | |
| tree | 989ae1cd4e264bbad80c65f04480486246e7b9f3 /arch/arm/mach-mx25 | |
| parent | 004c1c7096659d352b83047a7593e91d8a30e3c5 (diff) | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
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')
| -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[] = { | |||
| 229 | 229 | ||
| 230 | int __init mx25_clocks_init(void) | 230 | int __init mx25_clocks_init(void) |
| 231 | { | 231 | { |
| 232 | int i; | 232 | clkdev_add_table(lookups, ARRAY_SIZE(lookups)); |
| 233 | |||
| 234 | for (i = 0; i < ARRAY_SIZE(lookups); i++) | ||
| 235 | clkdev_add(&lookups[i]); | ||
| 236 | 233 | ||
| 237 | /* Turn off all clocks except the ones we need to survive, namely: | 234 | /* Turn off all clocks except the ones we need to survive, namely: |
| 238 | * EMI, GPIO1-3 (CCM_CGCR1[18:16]), GPT1, IOMUXC (CCM_CGCR1[27]), IIM, | 235 | * EMI, GPIO1-3 (CCM_CGCR1[18:16]), GPT1, IOMUXC (CCM_CGCR1[27]), IIM, |