summaryrefslogtreecommitdiffstats
path: root/drivers/irqchip
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-12-07 16:29:05 -0800
committerOlof Johansson <olof@lixom.net>2012-12-07 16:29:05 -0800
commita5559a3336205eaa7c8302fcbe9da1e35f2e5a3a (patch)
tree2b6f1d7e470fcccb5f99596af8e04328d8cc733a /drivers/irqchip
parent6e202df7bdb5cd6ae6a911f57b89e82161f75258 (diff)
parentff33657288bf1e62078bc97b87c358f5a1f15844 (diff)
downloadop-kernel-dev-a5559a3336205eaa7c8302fcbe9da1e35f2e5a3a.zip
op-kernel-dev-a5559a3336205eaa7c8302fcbe9da1e35f2e5a3a.tar.gz
Merge tag 'sunxi-fixes-for-3.8' of git://github.com/mripard/linux into next/soc
From Maxime Ripard: Fixes in sunXi related drivers for 3.8 * tag 'sunxi-fixes-for-3.8' of git://github.com/mripard/linux: irqchip: irq-sunxi: Add terminating entry for sunxi_irq_dt_ids clocksource: sunxi_timer: Add terminating entry for sunxi_timer_dt_ids
Diffstat (limited to 'drivers/irqchip')
-rw-r--r--drivers/irqchip/irq-sunxi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-sunxi.c b/drivers/irqchip/irq-sunxi.c
index eef41a4..10974fa 100644
--- a/drivers/irqchip/irq-sunxi.c
+++ b/drivers/irqchip/irq-sunxi.c
@@ -129,7 +129,8 @@ static int __init sunxi_of_init(struct device_node *node,
}
static struct of_device_id sunxi_irq_dt_ids[] __initconst = {
- { .compatible = "allwinner,sunxi-ic", .data = sunxi_of_init }
+ { .compatible = "allwinner,sunxi-ic", .data = sunxi_of_init },
+ { }
};
void __init sunxi_init_irq(void)
OpenPOWER on IntegriCloud