diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-08 15:48:25 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-08 15:48:25 -0400 |
| commit | ba9b28d19a3251bb1dfe6a6f8cc89b96fb85f683 (patch) | |
| tree | d770bd8c536771cb3804abb51ed029d7dd9d30d2 /drivers/net/wireless/Makefile | |
| parent | 862fc81b62c2d41a7e0b97b90844c80e59c7b0f1 (diff) | |
| parent | 5c601d0c942f5aaf7f3cff7e08f61047d70a964e (diff) | |
| download | kernel-crypto-ba9b28d19a3251bb1dfe6a6f8cc89b96fb85f683.tar.gz kernel-crypto-ba9b28d19a3251bb1dfe6a6f8cc89b96fb85f683.tar.xz kernel-crypto-ba9b28d19a3251bb1dfe6a6f8cc89b96fb85f683.zip | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
Diffstat (limited to 'drivers/net/wireless/Makefile')
| -rw-r--r-- | drivers/net/wireless/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index c8677987936..512603de309 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -40,3 +40,5 @@ obj-$(CONFIG_BCM43XX) += bcm43xx/ # 16-bit wireless PCMCIA client drivers obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o obj-$(CONFIG_PCMCIA_WL3501) += wl3501_cs.o + +obj-$(CONFIG_USB_ZD1201) += zd1201.o |