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

into pobox.com:/spare/repo/net-drivers-2.6

Merge pobox.com:/spare/repo/linux-2.6
into pobox.com:/spare/repo/net-drivers-2.6
b4bfad83 · Jeff Garzik · 46b043ef · cd631f0f · b4bfad83
Commit b4bfad83 authored Sep 30, 2004 by Jeff Garzik
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

drivers/net/tokenring/Kconfig drivers/net/tokenring/Kconfig +2 -1

No files found.
--- a/drivers/net/tokenring/Kconfig
+++ b/drivers/net/tokenring/Kconfig
@@ -84,7 +84,8 @@ config 3C359

 config TMS380TR
 	tristate "Generic TMS380 Token Ring ISA/PCI adapter support"
-	depends on TR && (PCI || ISA)
+	depends on TR && (PCI || ISA) && HOTPLUG
+	select FW_LOADER
 	---help---
 	  This driver provides generic support for token ring adapters
 	  based on the Texas Instruments TMS380 series chipsets.  This