diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-02 03:48:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-02 03:48:33 -0400 |
| commit | 5d8c397f304e1363f8ff9749b08172eb59e6534a (patch) | |
| tree | 57ff502553918aa7309b7375e983f27f719e7b28 /drivers/net/wireless/Makefile | |
| parent | 44757223cd77f6e332dfa0b043c67df7b665bc19 (diff) | |
| parent | ceeec3dc375e3b0618f16b34efc56fe093918f8b (diff) | |
Merge refs/heads/ieee80211-wifi from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/wireless/Makefile')
| -rw-r--r-- | drivers/net/wireless/Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index 2b87841322cc..0953cc0cdee6 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile | |||
| @@ -2,6 +2,10 @@ | |||
| 2 | # Makefile for the Linux Wireless network device drivers. | 2 | # Makefile for the Linux Wireless network device drivers. |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | obj-$(CONFIG_IPW2100) += ipw2100.o | ||
| 6 | |||
| 7 | obj-$(CONFIG_IPW2200) += ipw2200.o | ||
| 8 | |||
| 5 | obj-$(CONFIG_STRIP) += strip.o | 9 | obj-$(CONFIG_STRIP) += strip.o |
| 6 | obj-$(CONFIG_ARLAN) += arlan.o | 10 | obj-$(CONFIG_ARLAN) += arlan.o |
| 7 | 11 | ||
| @@ -28,6 +32,8 @@ obj-$(CONFIG_PCMCIA_ATMEL) += atmel_cs.o | |||
| 28 | 32 | ||
| 29 | obj-$(CONFIG_PRISM54) += prism54/ | 33 | obj-$(CONFIG_PRISM54) += prism54/ |
| 30 | 34 | ||
| 35 | obj-$(CONFIG_HOSTAP) += hostap/ | ||
| 36 | |||
| 31 | # 16-bit wireless PCMCIA client drivers | 37 | # 16-bit wireless PCMCIA client drivers |
| 32 | obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o | 38 | obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o |
| 33 | obj-$(CONFIG_PCMCIA_WL3501) += wl3501_cs.o | 39 | obj-$(CONFIG_PCMCIA_WL3501) += wl3501_cs.o |