diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 23:14:17 +0200 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 23:14:17 +0200 |
commit | 28af493cd7b89cba7e3ee534079cf4f41bb4b4f9 (patch) | |
tree | ea27df5ab7b728496a15602e0a7da74ff188378f /drivers/net/wireless | |
parent | [PATCH] Initialize the .owner field the tty_ldisc structure. (diff) | |
parent | [PATCH] kbuild: Eliminate build error when KALLSYMS not defined (diff) | |
download | linux-28af493cd7b89cba7e3ee534079cf4f41bb4b4f9.tar.xz linux-28af493cd7b89cba7e3ee534079cf4f41bb4b4f9.zip |
Merge branch 'master'
Diffstat (limited to 'drivers/net/wireless')
-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 config AIRO tristate "Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards" - depends on NET_RADIO && ISA && (PCI || BROKEN) + depends on NET_RADIO && ISA_DMA_API && (PCI || BROKEN) ---help--- This is the standard Linux driver to support Cisco/Aironet ISA and PCI 802.11 wireless cards. |