commit 75a95178dafb5c8d69b4abe45ea746a9cea23142
author Jeff Garzik <jgarzik@pobox.com> Wed Aug 24 01:03:34 2005 -0400
committer Jeff Garzik <jgarzik@pobox.com> Wed Aug 24 01:03:34 2005 -0400
tree 1dbf80c83d9521dcdebc9e670f48da6c1ba34187
parent 8531c5ffbca65f6df868637c26e6df6f88bff738
parent 0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf

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

Hand fix merge conflict in drivers/net/tokenring/Kconfig.

drivers/net/tokenring/Kconfig

diff --git a/drivers/net/tokenring/Kconfig b/drivers/net/tokenring/Kconfig
index 7d5c23e..e4cfc80 100644
--- a/drivers/net/tokenring/Kconfig
+++ b/drivers/net/tokenring/Kconfig
@@ -84,7 +84,7 @@
 
 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