]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8531c5f 0572e3d)
Merge upstream into 'upstream' branch of netdev-2.6.git.
authorJeff Garzik <jgarzik@pobox.com>
Wed, 24 Aug 2005 05:03:34 +0000 (01:03 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 24 Aug 2005 05:03:34 +0000 (01:03 -0400)
Hand fix merge conflict in drivers/net/tokenring/Kconfig.

1  2 
drivers/net/Kconfig patch | diff1 | diff2 | blob | history
drivers/net/tokenring/Kconfig patch | diff1 | diff2 | blob | history

diff --cc drivers/net/Kconfig
Simple merge
diff --cc drivers/net/tokenring/Kconfig
index 7d5c23e8cdd7f8fc9794ff816a6056b34df2f58c,7e99e9f8045e176213949a534178ada137b342d9..e4cfc80b283b74a4ead414593340520f5be9554c
--- 1/drivers/net/tokenring/Kconfig
--- 2/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
Linux 2.6 source tree