aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/irda/Makefile
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-30 01:58:41 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-10-30 01:58:41 -0500
commitfce45c1c8a6b5334fa88bbb9b1496b0699d3fef0 (patch)
treecba2597077cf33d122f8d771bf84618cc5374cf6 /drivers/net/irda/Makefile
parent15dbb5a3f971a28040ae6cbcd8bbdf19b629fa83 (diff)
parent81cfb8864c73230eb1c37753aba517db15cf4d8f (diff)
downloadkernel_samsung_tuna-fce45c1c8a6b5334fa88bbb9b1496b0699d3fef0.zip
kernel_samsung_tuna-fce45c1c8a6b5334fa88bbb9b1496b0699d3fef0.tar.gz
kernel_samsung_tuna-fce45c1c8a6b5334fa88bbb9b1496b0699d3fef0.tar.bz2
Merge branch 'upstream'
Diffstat (limited to 'drivers/net/irda/Makefile')
-rw-r--r--drivers/net/irda/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/irda/Makefile b/drivers/net/irda/Makefile
index 29a8bd8..e7a8b7f 100644
--- a/drivers/net/irda/Makefile
+++ b/drivers/net/irda/Makefile
@@ -18,6 +18,7 @@ obj-$(CONFIG_SMC_IRCC_FIR) += smsc-ircc2.o
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
# Old dongle drivers for old SIR drivers
obj-$(CONFIG_ESI_DONGLE_OLD) += esi.o
obj-$(CONFIG_TEKRAM_DONGLE_OLD) += tekram.o