diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2006-05-12 16:48:52 +0200 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-05-12 16:48:52 +0200 |
commit | 7d63b54a65ce902f9aaa8efe8192aa3b983264d4 (patch) | |
tree | 250a77bebe92cbd6edac70a649866044295876db /drivers/net/irda/Makefile | |
parent | [GFS2] Readpages support (diff) | |
parent | Linux v2.6.17-rc4 (diff) | |
download | linux-7d63b54a65ce902f9aaa8efe8192aa3b983264d4.tar.xz linux-7d63b54a65ce902f9aaa8efe8192aa3b983264d4.zip |
Merge branch 'master'
Diffstat (limited to 'drivers/net/irda/Makefile')
-rw-r--r-- | drivers/net/irda/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/irda/Makefile b/drivers/net/irda/Makefile index 27ab75f20799..c1ce2398efea 100644 --- a/drivers/net/irda/Makefile +++ b/drivers/net/irda/Makefile @@ -46,4 +46,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 |