Merge branch 'stericsson/fixes' into next/cleanup

[karo-tx-linux.git] / arch / arm / mach-prima2 / clock.c

diff --git a/arch/arm/mach-prima2/clock.c b/arch/arm/mach-prima2/clock.c
index f9a2aaf63f711de6c4e868cac8330e5ba551c961..aebad7e565cf7391b753cd482405356974f5b4b6 100644 (file)
--- a/arch/arm/mach-prima2/clock.c
+++ b/arch/arm/mach-prima2/clock.c
@@ -350,10 +350,10 @@ static struct clk_lookup onchip_clks[] = {
                .clk = &clk_mem,
        }, {
                .dev_id = "sys",
-                       .clk = &clk_sys,
+               .clk = &clk_sys,
        }, {
                .dev_id = "io",
-                       .clk = &clk_io,
+               .clk = &clk_io,
        },
 };
 
@@ -481,6 +481,7 @@ static void __init sirfsoc_clk_init(void)
 
 static struct of_device_id clkc_ids[] = {
        { .compatible = "sirf,prima2-clkc" },
+       {},
 };
 
 void __init sirfsoc_of_clk_init(void)