Merge branch 'sirf/fixes' into fixes

Changed files
+4
arch
arm
mach-prima2
+1
arch/arm/mach-prima2/clock.c
··· 481 482 static struct of_device_id clkc_ids[] = { 483 { .compatible = "sirf,prima2-clkc" }, 484 }; 485 486 void __init sirfsoc_of_clk_init(void)
··· 481 482 static struct of_device_id clkc_ids[] = { 483 { .compatible = "sirf,prima2-clkc" }, 484 + {}, 485 }; 486 487 void __init sirfsoc_of_clk_init(void)
+1
arch/arm/mach-prima2/irq.c
··· 51 52 static struct of_device_id intc_ids[] = { 53 { .compatible = "sirf,prima2-intc" }, 54 }; 55 56 void __init sirfsoc_of_irq_init(void)
··· 51 52 static struct of_device_id intc_ids[] = { 53 { .compatible = "sirf,prima2-intc" }, 54 + {}, 55 }; 56 57 void __init sirfsoc_of_irq_init(void)
+1
arch/arm/mach-prima2/rstc.c
··· 19 20 static struct of_device_id rstc_ids[] = { 21 { .compatible = "sirf,prima2-rstc" }, 22 }; 23 24 static int __init sirfsoc_of_rstc_init(void)
··· 19 20 static struct of_device_id rstc_ids[] = { 21 { .compatible = "sirf,prima2-rstc" }, 22 + {}, 23 }; 24 25 static int __init sirfsoc_of_rstc_init(void)
+1
arch/arm/mach-prima2/timer.c
··· 190 191 static struct of_device_id timer_ids[] = { 192 { .compatible = "sirf,prima2-tick" }, 193 }; 194 195 static void __init sirfsoc_of_timer_map(void)
··· 190 191 static struct of_device_id timer_ids[] = { 192 { .compatible = "sirf,prima2-tick" }, 193 + {}, 194 }; 195 196 static void __init sirfsoc_of_timer_map(void)