diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 08:59:45 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 08:59:45 -0400 |
| commit | d59bf96cdde5b874a57bfd1425faa45da915d0b7 (patch) | |
| tree | 351a40b72514d620e5bebea2de38c26f23277ffc /drivers/net/irda/Makefile | |
| parent | 28df955a2ad484d602314b30183ea8496a9aa34a (diff) | |
| parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-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 c1ce2398efea..5be09f1b9ee2 100644 --- a/drivers/net/irda/Makefile +++ b/drivers/net/irda/Makefile | |||
| @@ -19,6 +19,7 @@ obj-$(CONFIG_ALI_FIR) += ali-ircc.o | |||
| 19 | obj-$(CONFIG_VLSI_FIR) += vlsi_ir.o | 19 | obj-$(CONFIG_VLSI_FIR) += vlsi_ir.o |
| 20 | obj-$(CONFIG_VIA_FIR) += via-ircc.o | 20 | obj-$(CONFIG_VIA_FIR) += via-ircc.o |
| 21 | obj-$(CONFIG_PXA_FICP) += pxaficp_ir.o | 21 | obj-$(CONFIG_PXA_FICP) += pxaficp_ir.o |
| 22 | obj-$(CONFIG_MCS_FIR) += mcs7780.o | ||
| 22 | # Old dongle drivers for old SIR drivers | 23 | # Old dongle drivers for old SIR drivers |
| 23 | obj-$(CONFIG_ESI_DONGLE_OLD) += esi.o | 24 | obj-$(CONFIG_ESI_DONGLE_OLD) += esi.o |
| 24 | obj-$(CONFIG_TEKRAM_DONGLE_OLD) += tekram.o | 25 | obj-$(CONFIG_TEKRAM_DONGLE_OLD) += tekram.o |