tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'sirf/fixes' into fixes

Arnd Bergmann d035953e 1f51b001

options
unified split
Changed files
+4
arch
arm
mach-prima2
clock.c
irq.c
rstc.c
timer.c
+1
arch/arm/mach-prima2/clock.c
··· 481 481 482 482 static struct of_device_id clkc_ids[] = { 483 483 { .compatible = "sirf,prima2-clkc" }, 484 + {}, 484 485 }; 485 486 486 487 void __init sirfsoc_of_clk_init(void)
+1
arch/arm/mach-prima2/irq.c
··· 51 51 52 52 static struct of_device_id intc_ids[] = { 53 53 { .compatible = "sirf,prima2-intc" }, 54 + {}, 54 55 }; 55 56 56 57 void __init sirfsoc_of_irq_init(void)
+1
arch/arm/mach-prima2/rstc.c
··· 19 19 20 20 static struct of_device_id rstc_ids[] = { 21 21 { .compatible = "sirf,prima2-rstc" }, 22 + {}, 22 23 }; 23 24 24 25 static int __init sirfsoc_of_rstc_init(void)
+1
arch/arm/mach-prima2/timer.c
··· 190 190 191 191 static struct of_device_id timer_ids[] = { 192 192 { .compatible = "sirf,prima2-tick" }, 193 + {}, 193 194 }; 194 195 195 196 static void __init sirfsoc_of_timer_map(void)