Merge branch 'master' into csb1725

[mv-sheeva.git] / kernel / irq / Makefile

diff --git a/kernel/irq/Makefile b/kernel/irq/Makefile
index 7d047808419da88e273fba8cd1efd88d9aaa5bcd..54329cd7b3ee3cb5ed2084e2072933b183e8a446 100644 (file)
--- a/kernel/irq/Makefile
+++ b/kernel/irq/Makefile
@@ -1,7 +1,6 @@
 
-obj-y := handle.o manage.o spurious.o resend.o chip.o devres.o
+obj-y := irqdesc.o handle.o manage.o spurious.o resend.o chip.o dummychip.o devres.o
 obj-$(CONFIG_GENERIC_IRQ_PROBE) += autoprobe.o
 obj-$(CONFIG_PROC_FS) += proc.o
 obj-$(CONFIG_GENERIC_PENDING_IRQ) += migration.o
-obj-$(CONFIG_NUMA_IRQ_DESC) += numa_migrate.o
 obj-$(CONFIG_PM_SLEEP) += pm.o