diff options
| author | Olof Johansson <olof@lixom.net> | 2012-12-08 04:29:05 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-12-08 04:29:05 +0400 |
| commit | a5559a3336205eaa7c8302fcbe9da1e35f2e5a3a (patch) | |
| tree | 2b6f1d7e470fcccb5f99596af8e04328d8cc733a | |
| parent | 6e202df7bdb5cd6ae6a911f57b89e82161f75258 (diff) | |
| parent | ff33657288bf1e62078bc97b87c358f5a1f15844 (diff) | |
| download | linux-a5559a3336205eaa7c8302fcbe9da1e35f2e5a3a.tar.xz | |
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
| -rw-r--r-- | drivers/clocksource/sunxi_timer.c | 1 | ||||
| -rw-r--r-- | drivers/irqchip/irq-sunxi.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/clocksource/sunxi_timer.c b/drivers/clocksource/sunxi_timer.c index 3c46434b64cb..3cd1bd3d7aee 100644 --- a/drivers/clocksource/sunxi_timer.c +++ b/drivers/clocksource/sunxi_timer.c @@ -101,6 +101,7 @@ static struct irqaction sunxi_timer_irq = { static struct of_device_id sunxi_timer_dt_ids[] = { { .compatible = "allwinner,sunxi-timer" }, + { } }; static void __init sunxi_timer_init(void) diff --git a/drivers/irqchip/irq-sunxi.c b/drivers/irqchip/irq-sunxi.c index eef41a49acae..10974fa42653 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) |