Merge upstream into 'upstream' branch of netdev-2.6.git.

[safe/jmp/linux-2.6] / drivers / net / tokenring / Kconfig

diff --git a/drivers/net/tokenring/Kconfig b/drivers/net/tokenring/Kconfig
index 7d5c23e..e4cfc80 100644 (file)
--- 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