Merge branch 'sirf/fixes' into fixes

kyagi · Sep 12, 2011 · d035953 · d035953
2 parents 1f51b00 + 6a53747
commit d035953
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 deletions.
diff --git a/arch/arm/mach-prima2/clock.c b/arch/arm/mach-prima2/clock.c
@@ -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)

diff --git a/arch/arm/mach-prima2/irq.c b/arch/arm/mach-prima2/irq.c
@@ -51,6 +51,7 @@ static __init void sirfsoc_irq_init(void)
 
 static struct of_device_id intc_ids[]  = {
 	{ .compatible = "sirf,prima2-intc" },
+	{},
 };
 
 void __init sirfsoc_of_irq_init(void)

diff --git a/arch/arm/mach-prima2/rstc.c b/arch/arm/mach-prima2/rstc.c
@@ -19,6 +19,7 @@ static DEFINE_MUTEX(rstc_lock);
 
 static struct of_device_id rstc_ids[]  = {
 	{ .compatible = "sirf,prima2-rstc" },
+	{},
 };
 
 static int __init sirfsoc_of_rstc_init(void)

diff --git a/arch/arm/mach-prima2/timer.c b/arch/arm/mach-prima2/timer.c
@@ -190,6 +190,7 @@ static void __init sirfsoc_timer_init(void)
 
 static struct of_device_id timer_ids[] = {
 	{ .compatible = "sirf,prima2-tick" },
+	{},
 };
 
 static void __init sirfsoc_of_timer_map(void)
-Original file line number
+Diff line change
@@ Expand Up / @@ -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)
@@ Expand Down @@