summaryrefslogtreecommitdiffstats
path: root/drivers/net/tokenring
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-08-24 01:03:34 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-08-24 01:03:34 -0400
commit75a95178dafb5c8d69b4abe45ea746a9cea23142 (patch)
tree1dbf80c83d9521dcdebc9e670f48da6c1ba34187 /drivers/net/tokenring
parent8531c5ffbca65f6df868637c26e6df6f88bff738 (diff)
parent0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf (diff)
downloadkernel-crypto-75a95178dafb5c8d69b4abe45ea746a9cea23142.tar.gz
kernel-crypto-75a95178dafb5c8d69b4abe45ea746a9cea23142.tar.xz
kernel-crypto-75a95178dafb5c8d69b4abe45ea746a9cea23142.zip
Merge upstream into 'upstream' branch of netdev-2.6.git.
Hand fix merge conflict in drivers/net/tokenring/Kconfig.
Diffstat (limited to 'drivers/net/tokenring')
-rw-r--r--drivers/net/tokenring/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tokenring/Kconfig b/drivers/net/tokenring/Kconfig
index 7d5c23e8cdd..e4cfc80b283 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 || MCA)
+ depends on TR && (PCI || ISA && ISA_DMA_API || MCA)
select FW_LOADER
---help---
This driver provides generic support for token ring adapters