Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[linux-2.6-omap-h63xx.git] / drivers / net / irda / Makefile

diff --git a/drivers/net/irda/Makefile b/drivers/net/irda/Makefile
index 27ab75f20799d5c52a09c9fdf3bc0bc7ebf6784f..5be09f1b9ee2f4b8dc056540342955405b72b215 100644 (file)
--- a/drivers/net/irda/Makefile
+++ b/drivers/net/irda/Makefile
@@ -19,6 +19,7 @@ obj-$(CONFIG_ALI_FIR)         += ali-ircc.o
 obj-$(CONFIG_VLSI_FIR)         += vlsi_ir.o
 obj-$(CONFIG_VIA_FIR)          += via-ircc.o
 obj-$(CONFIG_PXA_FICP)         += pxaficp_ir.o
+obj-$(CONFIG_MCS_FIR)          += mcs7780.o
 # Old dongle drivers for old SIR drivers
 obj-$(CONFIG_ESI_DONGLE_OLD)           += esi.o
 obj-$(CONFIG_TEKRAM_DONGLE_OLD)        += tekram.o
@@ -46,4 +47,4 @@ obj-$(CONFIG_MA600_DONGLE)    += ma600-sir.o
 obj-$(CONFIG_TOIM3232_DONGLE)  += toim3232-sir.o
 
 # The SIR helper module
-sir-dev-objs := sir_dev.o sir_dongle.o sir_kthread.o
+sir-dev-objs := sir_dev.o sir_dongle.o