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

1 files changed, 1 insertions, 3 deletions

diff --git a/arch/arm/mach-mxc91231/clock.c b/arch/arm/mach-mxc91231/clock.c
index ecfa37fef8ad..5c85075d8a56 100644
--- a/arch/arm/mach-mxc91231/clock.c
+++ b/arch/arm/mach-mxc91231/clock.c
@@ -624,7 +624,6 @@ static struct clk_lookup lookups[] = {
 int __init mxc91231_clocks_init(unsigned long fref)
 {
         void __iomem *gpt_base;
-        int i;
 
         ckih_rate = fref;
 
@@ -632,8 +631,7 @@ int __init mxc91231_clocks_init(unsigned long fref)
         sdhc_clk[0].parent = clk_sdhc_parent(&sdhc_clk[0]);
         sdhc_clk[1].parent = clk_sdhc_parent(&sdhc_clk[1]);
 
-        for (i = 0; i < ARRAY_SIZE(lookups); i++)
-                clkdev_add(&lookups[i]);
+        clkdev_add_table(lookups, ARRAY_SIZE(lookups));
 
         gpt_base = MXC91231_IO_ADDRESS(MXC91231_GPT1_BASE_ADDR);
         mxc_timer_init(&gpt_clk, gpt_base, MXC91231_INT_GPT);