diff options
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/Kconfig | 13 | ||||
-rw-r--r-- | drivers/net/wireless/Makefile | 2 | ||||
-rw-r--r-- | drivers/net/wireless/libertas_tf/Makefile | 6 |
3 files changed, 21 insertions, 0 deletions
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index 9931b5ab59cd..1ac46ad48c3e 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig | |||
@@ -300,6 +300,19 @@ config LIBERTAS_DEBUG | |||
300 | ---help--- | 300 | ---help--- |
301 | Debugging support. | 301 | Debugging support. |
302 | 302 | ||
303 | config LIBERTAS_THINFIRM | ||
304 | tristate "Marvell 8xxx Libertas WLAN driver support with thin firmware" | ||
305 | depends on WLAN_80211 && MAC80211 | ||
306 | select FW_LOADER | ||
307 | ---help--- | ||
308 | A library for Marvell Libertas 8xxx devices using thinfirm. | ||
309 | |||
310 | config LIBERTAS_THINFIRM_USB | ||
311 | tristate "Marvell Libertas 8388 USB 802.11b/g cards with thin firmware" | ||
312 | depends on LIBERTAS_THINFIRM && USB | ||
313 | ---help--- | ||
314 | A driver for Marvell Libertas 8388 USB devices using thinfirm. | ||
315 | |||
303 | config AIRO | 316 | config AIRO |
304 | tristate "Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards" | 317 | tristate "Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards" |
305 | depends on ISA_DMA_API && WLAN_80211 && (PCI || BROKEN) | 318 | depends on ISA_DMA_API && WLAN_80211 && (PCI || BROKEN) |
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index 59aa89ec6e81..c05fd7627f3f 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile | |||
@@ -48,6 +48,8 @@ obj-$(CONFIG_USB_NET_RNDIS_WLAN) += rndis_wlan.o | |||
48 | obj-$(CONFIG_USB_ZD1201) += zd1201.o | 48 | obj-$(CONFIG_USB_ZD1201) += zd1201.o |
49 | obj-$(CONFIG_LIBERTAS) += libertas/ | 49 | obj-$(CONFIG_LIBERTAS) += libertas/ |
50 | 50 | ||
51 | obj-$(CONFIG_LIBERTAS_THINFIRM) += libertas_tf/ | ||
52 | |||
51 | rtl8180-objs := rtl8180_dev.o rtl8180_rtl8225.o rtl8180_sa2400.o rtl8180_max2820.o rtl8180_grf5101.o | 53 | rtl8180-objs := rtl8180_dev.o rtl8180_rtl8225.o rtl8180_sa2400.o rtl8180_max2820.o rtl8180_grf5101.o |
52 | rtl8187-objs := rtl8187_dev.o rtl8187_rtl8225.o | 54 | rtl8187-objs := rtl8187_dev.o rtl8187_rtl8225.o |
53 | 55 | ||
diff --git a/drivers/net/wireless/libertas_tf/Makefile b/drivers/net/wireless/libertas_tf/Makefile new file mode 100644 index 000000000000..ff5544d6ac9d --- /dev/null +++ b/drivers/net/wireless/libertas_tf/Makefile | |||
@@ -0,0 +1,6 @@ | |||
1 | libertas_tf-objs := main.o cmd.o | ||
2 | |||
3 | libertas_tf_usb-objs += if_usb.o | ||
4 | |||
5 | obj-$(CONFIG_LIBERTAS_THINFIRM) += libertas_tf.o | ||
6 | obj-$(CONFIG_LIBERTAS_THINFIRM_USB) += libertas_tf_usb.o | ||