diff options
author | Greg KH <greg@press.(none)> | 2005-10-28 19:13:16 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 19:13:16 +0200 |
commit | 6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (patch) | |
tree | c0414e89678fcef7ce3493e048d855bde781ae8d /drivers/net/irda/Makefile | |
parent | [PATCH] Fix documentation of driver suspend/resume callbacks (diff) | |
parent | Merge master.kernel.org:/home/rmk/linux-2.6-mmc (diff) | |
download | linux-6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5.tar.xz linux-6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5.zip |
Merge ../bleed-2.6
Diffstat (limited to 'drivers/net/irda/Makefile')
-rw-r--r-- | drivers/net/irda/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/irda/Makefile b/drivers/net/irda/Makefile index 29a8bd812b21..e7a8b7f7f5dd 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 |