Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / kernel / irq / Makefile

diff --git a/kernel/irq/Makefile b/kernel/irq/Makefile
index 2b33f852be3eaf123aa63d530f2d58c5126a19c2..9f77f50d814317409f1ed02ce73372bfb428c99f 100644 (file)
--- a/kernel/irq/Makefile
+++ b/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