diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-04 02:35:56 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-04 02:35:56 -0400 |
| commit | 15c42e5a1f0bccb69508059b8ae0720840068b8e (patch) | |
| tree | 921b088cc7acb50bb8b65dbc30451a8a3958ec8d /drivers/net/tokenring/Kconfig | |
| parent | 541e316aed6f7d6efeb427a88645c2a8f61418d6 (diff) | |
| parent | f505380ba7b98ec97bf25300c2a58aeae903530b (diff) | |
Merge HEAD from rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/net/tokenring/Kconfig')
| -rw-r--r-- | drivers/net/tokenring/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/tokenring/Kconfig b/drivers/net/tokenring/Kconfig index 23d0fa4bbceb..e4cfc80b283b 100644 --- a/drivers/net/tokenring/Kconfig +++ b/drivers/net/tokenring/Kconfig | |||
| @@ -84,7 +84,7 @@ config 3C359 | |||
| 84 | 84 | ||
| 85 | config TMS380TR | 85 | config TMS380TR |
| 86 | tristate "Generic TMS380 Token Ring ISA/PCI adapter support" | 86 | tristate "Generic TMS380 Token Ring ISA/PCI adapter support" |
| 87 | depends on TR && (PCI || ISA) | 87 | depends on TR && (PCI || ISA && ISA_DMA_API || MCA) |
| 88 | select FW_LOADER | 88 | select FW_LOADER |
| 89 | ---help--- | 89 | ---help--- |
| 90 | This driver provides generic support for token ring adapters | 90 | This driver provides generic support for token ring adapters |
| @@ -158,7 +158,7 @@ config ABYSS | |||
| 158 | 158 | ||
| 159 | config MADGEMC | 159 | config MADGEMC |
| 160 | tristate "Madge Smart 16/4 Ringnode MicroChannel" | 160 | tristate "Madge Smart 16/4 Ringnode MicroChannel" |
| 161 | depends on TR && TMS380TR && MCA_LEGACY | 161 | depends on TR && TMS380TR && MCA |
| 162 | help | 162 | help |
| 163 | This tms380 module supports the Madge Smart 16/4 MC16 and MC32 | 163 | This tms380 module supports the Madge Smart 16/4 MC16 and MC32 |
| 164 | MicroChannel adapters. | 164 | MicroChannel adapters. |