dect
/
linux-2.6
Archived
13
0
Fork 0

Fixes in sunXi related drivers for 3.8

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iEYEABECAAYFAlDAZ8MACgkQGxsu9jQV9nZP1ACfaQv/G9U6T9iNSkY+IuOUY/h2
 QMMAnjo0VIlSPx2z/Jr+ZRFfGWtbTtxT
 =Jthr
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Olof Johansson 2012-12-07 16:29:05 -08:00
commit a5559a3336
2 changed files with 3 additions and 1 deletions

View File

@ -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)

View File

@ -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)