Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5559a33 authored by Olof Johansson's avatar Olof Johansson
Browse files

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
parents 6e202df7 ff336572

drivers/clocksource/sunxi_timer.c

+1 −0
Original line number Diff line number Diff line
@@ -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)

drivers/irqchip/irq-sunxi.c

+2 −1
Original line number Diff line number Diff line
@@ -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)