Merge branch 'upstream'

[linux-2.6] / kernel / irq / migration.c

diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c
index 52a8655fa080047a64cf3dc39635d28c2183abb7..134f9f2e0e3962cabf8859d6bc5581f9dfdfea16 100644 (file)
--- a/kernel/irq/migration.c
+++ b/kernel/irq/migration.c
@@ -1,6 +1,5 @@
-#include <linux/irq.h>
 
-#if defined(CONFIG_GENERIC_PENDING_IRQ)
+#include <linux/irq.h>
 
 void set_pending_irq(unsigned int irq, cpumask_t mask)
 {
@@ -61,5 +60,3 @@ void move_native_irq(int irq)
        }
        cpus_clear(pending_irq_cpumask[irq]);
 }
-
-#endif