diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 17:14:17 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 17:14:17 -0400 |
| commit | 28af493cd7b89cba7e3ee534079cf4f41bb4b4f9 (patch) | |
| tree | ea27df5ab7b728496a15602e0a7da74ff188378f /drivers/net | |
| parent | 74cfe03f80adc320bde4dd37616354aefe2271aa (diff) | |
| parent | 39ca371c45b04cd50d0974030ae051906fc516b6 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index 00a07f32a81e..7187958e40ca 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig | |||
| @@ -243,7 +243,7 @@ config IPW_DEBUG | |||
| 243 | 243 | ||
| 244 | config AIRO | 244 | config AIRO |
| 245 | tristate "Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards" | 245 | tristate "Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards" |
| 246 | depends on NET_RADIO && ISA && (PCI || BROKEN) | 246 | depends on NET_RADIO && ISA_DMA_API && (PCI || BROKEN) |
| 247 | ---help--- | 247 | ---help--- |
| 248 | This is the standard Linux driver to support Cisco/Aironet ISA and | 248 | This is the standard Linux driver to support Cisco/Aironet ISA and |
| 249 | PCI 802.11 wireless cards. | 249 | PCI 802.11 wireless cards. |