diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-21 17:05:11 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-21 17:05:11 -0800 |
| commit | 6c0bce37ffc8f000a516fadf6dee84579c4c8f9b (patch) | |
| tree | 273af34d6f777b1ecb0fce7b2685e868064e6cf9 /drivers/net/wireless/Makefile | |
| parent | e243455d345ef62751723671bc2605a2f6032ceb (diff) | |
| parent | a1eb5fe319beb9e181aa52c8adf75ad9aab56a89 (diff) | |
| download | kernel_samsung_tuna-6c0bce37ffc8f000a516fadf6dee84579c4c8f9b.zip kernel_samsung_tuna-6c0bce37ffc8f000a516fadf6dee84579c4c8f9b.tar.gz kernel_samsung_tuna-6c0bce37ffc8f000a516fadf6dee84579c4c8f9b.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/Makefile')
| -rw-r--r-- | drivers/net/wireless/Makefile | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index 7882084..ac590e1c 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -2,9 +2,8 @@ # Makefile for the Linux Wireless network device drivers. # -obj-$(CONFIG_IPW2100) += ipw2100.o - -obj-$(CONFIG_IPW2200) += ipw2200.o +obj-$(CONFIG_IPW2100) += ipw2x00/ +obj-$(CONFIG_IPW2200) += ipw2x00/ obj-$(CONFIG_STRIP) += strip.o obj-$(CONFIG_ARLAN) += arlan.o @@ -31,6 +30,8 @@ obj-$(CONFIG_HOSTAP) += hostap/ obj-$(CONFIG_B43) += b43/ obj-$(CONFIG_B43LEGACY) += b43legacy/ obj-$(CONFIG_ZD1211RW) += zd1211rw/ +obj-$(CONFIG_RTL8180) += rtl818x/ +obj-$(CONFIG_RTL8187) += rtl818x/ # 16-bit wireless PCMCIA client drivers obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o @@ -43,12 +44,6 @@ obj-$(CONFIG_LIBERTAS) += libertas/ obj-$(CONFIG_LIBERTAS_THINFIRM) += libertas_tf/ -rtl8180-objs := rtl8180_dev.o rtl8180_rtl8225.o rtl8180_sa2400.o rtl8180_max2820.o rtl8180_grf5101.o -rtl8187-objs := rtl8187_dev.o rtl8187_rtl8225.o - -obj-$(CONFIG_RTL8180) += rtl8180.o -obj-$(CONFIG_RTL8187) += rtl8187.o - obj-$(CONFIG_ADM8211) += adm8211.o obj-$(CONFIG_IWLWIFI) += iwlwifi/ |