diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-17 18:04:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-17 18:04:31 -0400 |
| commit | af4330631cd48987755f1a8d324dc318f60cf16b (patch) | |
| tree | 3c9233e81b450921326da13a7f8abacb58ab1f5e /drivers/net/wireless/Kconfig | |
| parent | 2d6a5e9500103680464a723a4564961675652680 (diff) | |
| parent | 808ff697b357cee54e214efd27921a9ec6461a94 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/Kconfig')
| -rw-r--r-- | drivers/net/wireless/Kconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index 1294175cab20..612fffe100a6 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig | |||
| @@ -473,6 +473,15 @@ config MAC80211_HWSIM | |||
| 473 | To compile this driver as a module, choose M here: the module will be | 473 | To compile this driver as a module, choose M here: the module will be |
| 474 | called mac80211_hwsim. If unsure, say N. | 474 | called mac80211_hwsim. If unsure, say N. |
| 475 | 475 | ||
| 476 | config MWL8K | ||
| 477 | tristate "Marvell 88W8xxx PCI/PCIe Wireless support" | ||
| 478 | depends on MAC80211 && PCI && WLAN_80211 && EXPERIMENTAL | ||
| 479 | ---help--- | ||
| 480 | This driver supports Marvell TOPDOG 802.11 wireless cards. | ||
| 481 | |||
| 482 | To compile this driver as a module, choose M here: the module | ||
| 483 | will be called mwl8k. If unsure, say N. | ||
| 484 | |||
| 476 | source "drivers/net/wireless/p54/Kconfig" | 485 | source "drivers/net/wireless/p54/Kconfig" |
| 477 | source "drivers/net/wireless/ath5k/Kconfig" | 486 | source "drivers/net/wireless/ath5k/Kconfig" |
| 478 | source "drivers/net/wireless/ath9k/Kconfig" | 487 | source "drivers/net/wireless/ath9k/Kconfig" |