---

yaml --- r: 335715 b: refs/heads/master c: 36e42a3 h: refs/heads/master i: 335713: dba54b6 335711: 6343461 v: v3
git-mirror · Nov 6, 2012 · cfb9dfe · cfb9dfe
1 parent 674faa1
commit cfb9dfe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dfac74d38ec45bbdb80979ec966e1e703554c864
+refs/heads/master: 36e42a323cf0de26bd819448b024d3851fc0d865
diff --git a/trunk/drivers/irqchip/irq-bcm2835.c b/trunk/drivers/irqchip/irq-bcm2835.c
@@ -168,7 +168,8 @@ static int __init armctrl_of_init(struct device_node *node,
 }
 
 static struct of_device_id irq_of_match[] __initconst = {
-	{ .compatible = "brcm,bcm2835-armctrl-ic", .data = armctrl_of_init }
+	{ .compatible = "brcm,bcm2835-armctrl-ic", .data = armctrl_of_init },
+	{ }
 };
 
 void __init bcm2835_init_irq(void)