diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-06-27 23:45:25 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-27 23:45:25 -0400 |
| commit | 30b4d6565e4d57c6d03600c7822411c7cac19638 (patch) | |
| tree | 57244f2a9694de61b373631841fc493bbdf43022 /drivers/net/wireless/Kconfig | |
| parent | aa8f6dfd355021b4dd8b74b0588fd6fd8f21b79f (diff) | |
| parent | ad3fee560bc508008b3b2cf6358105c4c7081921 (diff) | |
Merge /spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'drivers/net/wireless/Kconfig')
| -rw-r--r-- | drivers/net/wireless/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index a4a7e8a41775..ff5b1b1de2fa 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig | |||
| @@ -192,9 +192,8 @@ config IPW_DEBUG | |||
| 192 | 192 | ||
| 193 | config IPW2200 | 193 | config IPW2200 |
| 194 | tristate "Intel PRO/Wireless 2200BG and 2915ABG Network Connection" | 194 | tristate "Intel PRO/Wireless 2200BG and 2915ABG Network Connection" |
| 195 | depends on NET_RADIO && PCI | 195 | depends on IEEE80211 && PCI |
| 196 | select FW_LOADER | 196 | select FW_LOADER |
| 197 | select IEEE80211 | ||
| 198 | ---help--- | 197 | ---help--- |
| 199 | A driver for the Intel PRO/Wireless 2200BG and 2915ABG Network | 198 | A driver for the Intel PRO/Wireless 2200BG and 2915ABG Network |
| 200 | Connection adapters. | 199 | Connection adapters. |