Skip to content

L
linux
Commit b4bfad83 authored by Jeff Garzik's avatar Jeff Garzik
Browse files
Options

Merge pobox.com:/spare/repo/linux-2.6 

into pobox.com:/spare/repo/net-drivers-2.6
parents 46b043ef cd631f0f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
drivers/net/tokenring/Kconfig
View file @ b4bfad83
...@@ -84,7 +84,8 @@ config 3C359 ...@@ -84,7 +84,8 @@ config 3C359
config TMS380TR config TMS380TR
tristate "Generic TMS380 Token Ring ISA/PCI adapter support" tristate "Generic TMS380 Token Ring ISA/PCI adapter support"
depends on TR && (PCI || ISA) depends on TR && (PCI || ISA) && HOTPLUG
select FW_LOADER
---help--- ---help---
This driver provides generic support for token ring adapters This driver provides generic support for token ring adapters
based on the Texas Instruments TMS380 series chipsets. This based on the Texas Instruments TMS380 series chipsets. This
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7