From: Jeff Garzik <jgarzik@pobox.com>
Date: Wed, 24 Aug 2005 05:03:34 +0000 (-0400)
Subject: Merge upstream into 'upstream' branch of netdev-2.6.git.
X-Git-Tag: v2.6.14-rc1~1055^2~3
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=75a95178dafb5c8d69b4abe45ea746a9cea23142;p=linux-2.6-omap-h63xx.git

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

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

75a95178dafb5c8d69b4abe45ea746a9cea23142
diff --cc drivers/net/tokenring/Kconfig
index 7d5c23e8cdd,7e99e9f8045..e4cfc80b283
--- a/drivers/net/tokenring/Kconfig
+++ b/drivers/net/tokenring/Kconfig
@@@ -84,7 -84,7 +84,7 @@@ config 3C35
  
  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)
++	depends on TR && (PCI || ISA && ISA_DMA_API || MCA)
  	select FW_LOADER
  	---help---
  	  This driver provides generic support for token ring adapters