diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 17:10:38 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 17:10:38 -0500 |
| commit | 9f33be2c3a80bdc2cc08342dd77fac87652e0548 (patch) | |
| tree | 7ad6e825427a15c5ec0fc15540abc0429d7f4bce /arch/arm/mach-versatile | |
| parent | 2741ecb4ce5c2d430b5c44b0a169038338c21df5 (diff) | |
| parent | eed18b5fa4d297c681b00144e8c6942dd35d39a7 (diff) | |
Merge branches 'clks' and 'pnx' into devel
Diffstat (limited to 'arch/arm/mach-versatile')
| -rw-r--r-- | arch/arm/mach-versatile/core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c index e13be7c444ca..9ddb49b1cb71 100644 --- a/arch/arm/mach-versatile/core.c +++ b/arch/arm/mach-versatile/core.c | |||
| @@ -851,8 +851,7 @@ void __init versatile_init(void) | |||
| 851 | { | 851 | { |
| 852 | int i; | 852 | int i; |
| 853 | 853 | ||
| 854 | for (i = 0; i < ARRAY_SIZE(lookups); i++) | 854 | clkdev_add_table(lookups, ARRAY_SIZE(lookups)); |
| 855 | clkdev_add(&lookups[i]); | ||
| 856 | 855 | ||
| 857 | platform_device_register(&versatile_flash_device); | 856 | platform_device_register(&versatile_flash_device); |
| 858 | platform_device_register(&versatile_i2c_device); | 857 | platform_device_register(&versatile_i2c_device); |