git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
net
/
tokenring
/
Kconfig
diff --git
a/drivers/net/tokenring/Kconfig
b/drivers/net/tokenring/Kconfig
index
23d0fa4
..
99c4c19
100644
(file)
--- a/
drivers/net/tokenring/Kconfig
+++ b/
drivers/net/tokenring/Kconfig
@@
-3,7
+3,7
@@
#
menu "Token Ring devices"
#
menu "Token Ring devices"
- depends on NETDEVICES
+ depends on NETDEVICES
&& !UML
# So far, we only have PCI, ISA, and MCA token ring devices
config TR
# So far, we only have PCI, ISA, and MCA token ring devices
config TR
@@
-84,7
+84,7
@@
config 3C359
config TMS380TR
tristate "Generic TMS380 Token Ring ISA/PCI adapter support"
config TMS380TR
tristate "Generic TMS380 Token Ring ISA/PCI adapter support"
- depends on TR && (PCI || ISA)
+ depends on TR && (PCI || ISA
&& ISA_DMA_API || MCA
)
select FW_LOADER
---help---
This driver provides generic support for token ring adapters
select FW_LOADER
---help---
This driver provides generic support for token ring adapters
@@
-158,7
+158,7
@@
config ABYSS
config MADGEMC
tristate "Madge Smart 16/4 Ringnode MicroChannel"
config MADGEMC
tristate "Madge Smart 16/4 Ringnode MicroChannel"
- depends on TR && TMS380TR && MCA
_LEGACY
+ depends on TR && TMS380TR && MCA
help
This tms380 module supports the Madge Smart 16/4 MC16 and MC32
MicroChannel adapters.
help
This tms380 module supports the Madge Smart 16/4 MC16 and MC32
MicroChannel adapters.