From cfb9dfed5c29418369d8cd891504cb7d1a4937d4 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Thu, 1 Nov 2012 22:02:50 -0600 Subject: [PATCH] --- yaml --- r: 335715 b: refs/heads/master c: 36e42a323cf0de26bd819448b024d3851fc0d865 h: refs/heads/master i: 335713: dba54b6c960757a345377cbf376ecb76228ac24d 335711: 6343461a1a1665521ceed0f9e5321b535d4c4dc4 v: v3 --- [refs] | 2 +- trunk/drivers/irqchip/irq-bcm2835.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e8b3f275bd64..93d9df18fd12 100644 --- 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 index dc670ccc6978..16c78f1c5ef2 100644 --- 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)