Merge branches 'irq/genirq', 'irq/sparseirq' and 'irq/urgent' into irq/core

2009-02-13 11:57:18 +01:00
parent 37bed90094 0e43785c57 005bf0e6fa 548c893380
commit 8f8573ae9f
33 changed files with 97 additions and 70 deletions
--- a/arch/sparc/kernel/time_64.c
+++ b/arch/sparc/kernel/time_64.c
@@ -36,10 +36,10 @@
 #include <linux/clocksource.h>
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
+#include <linux/irq.h>

 #include <asm/oplib.h>
 #include <asm/timer.h>
-#include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/prom.h>
 #include <asm/starfire.h>