diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-02 00:02:27 +0200 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-02 00:02:27 +0200 |
commit | ceeec3dc375e3b0618f16b34efc56fe093918f8b (patch) | |
tree | 2293d02721ee05131aaf1c60e4fba7e281585eec /drivers/net/tokenring/Kconfig | |
parent | [PATCH] hostap: Fix null pointer dereference in prism2_pccard_card_present() (diff) | |
parent | /spare/repo/netdev-2.6 branch 'master' (diff) | |
download | linux-ceeec3dc375e3b0618f16b34efc56fe093918f8b.tar.xz linux-ceeec3dc375e3b0618f16b34efc56fe093918f8b.zip |
/spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'drivers/net/tokenring/Kconfig')
-rw-r--r-- | drivers/net/tokenring/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/tokenring/Kconfig b/drivers/net/tokenring/Kconfig index 7e99e9f8045e..e4cfc80b283b 100644 --- a/drivers/net/tokenring/Kconfig +++ b/drivers/net/tokenring/Kconfig @@ -84,7 +84,7 @@ config 3C359 config TMS380TR tristate "Generic TMS380 Token Ring ISA/PCI adapter support" - depends on TR && (PCI || ISA && ISA_DMA_API) + depends on TR && (PCI || ISA && ISA_DMA_API || MCA) select FW_LOADER ---help--- This driver provides generic support for token ring adapters @@ -158,7 +158,7 @@ config ABYSS config MADGEMC tristate "Madge Smart 16/4 Ringnode MicroChannel" - depends on TR && TMS380TR && MCA_LEGACY + depends on TR && TMS380TR && MCA help This tms380 module supports the Madge Smart 16/4 MC16 and MC32 MicroChannel adapters. |