From 6f0499f3c4b83c40bdec34a74544a12489873e09 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Mon, 10 Apr 2006 22:54:04 -0700
Subject: [PATCH] --- yaml --- r: 25503 b: refs/heads/master c:
 d824e66a9a427faf69c58f98dd7e1c3d1bb51c61 h: refs/heads/master i:   25501:
 edc117b973fa1a46f33d5666af3106f06a26cb1a   25499:
 0e0d9379f42e44e891600f335a8e53b18b27ed1e   25495:
 940294727d70d2257f4c519586d3c9ae16048069   25487:
 8193a8dd81077bcb8c27617084800c8ad4397638   25471:
 7f3839ed8b2106ec947426a34adde3f4eddabacd v: v3

---
 [refs]                       | 2 +-
 trunk/kernel/irq/Makefile    | 3 ++-
 trunk/kernel/irq/migration.c | 5 +----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index d64c980b5c15..85fb0a2bc9e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6422f17d3a480f21917a3895e2a46b968f56a08
+refs/heads/master: d824e66a9a427faf69c58f98dd7e1c3d1bb51c61
diff --git a/trunk/kernel/irq/Makefile b/trunk/kernel/irq/Makefile
index 2b33f852be3e..9f77f50d8143 100644
--- a/trunk/kernel/irq/Makefile
+++ b/trunk/kernel/irq/Makefile
@@ -1,4 +1,5 @@
 
-obj-y := handle.o manage.o spurious.o migration.o
+obj-y := handle.o manage.o spurious.o
 obj-$(CONFIG_GENERIC_IRQ_PROBE) += autoprobe.o
 obj-$(CONFIG_PROC_FS) += proc.o
+obj-$(CONFIG_GENERIC_PENDING_IRQ) += migration.o
diff --git a/trunk/kernel/irq/migration.c b/trunk/kernel/irq/migration.c
index 52a8655fa080..134f9f2e0e39 100644
--- a/trunk/kernel/irq/migration.c
+++ b/trunk/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