Commit 135c294f authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] don't select CONFIG_HOTPLUG

It's useful to be able to turn off CONFIG_HOTPLUG for compile-coverage testing
and for section-checking coverage.  But a few things go and select
CONFIG_HOTPLUG, making it a royal PITA to turn the thing off.

It's only turnable offable if CONFIG_EMBEDDED anyway.  So let's make those
things depend on HOTPLUG, not select it.

Cc: Greg KH <greg@kroah.com>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b3cf2576
...@@ -20,7 +20,7 @@ config PREVENT_FIRMWARE_BUILD ...@@ -20,7 +20,7 @@ config PREVENT_FIRMWARE_BUILD
config FW_LOADER config FW_LOADER
tristate "Userspace firmware loading support" tristate "Userspace firmware loading support"
select HOTPLUG depends on HOTPLUG
---help--- ---help---
This option is provided for the case where no in-kernel-tree modules This option is provided for the case where no in-kernel-tree modules
require userspace firmware loading support, but a module built outside require userspace firmware loading support, but a module built outside
......
...@@ -6,8 +6,7 @@ menu "PCI Hotplug Support" ...@@ -6,8 +6,7 @@ menu "PCI Hotplug Support"
config HOTPLUG_PCI config HOTPLUG_PCI
tristate "Support for PCI Hotplug (EXPERIMENTAL)" tristate "Support for PCI Hotplug (EXPERIMENTAL)"
depends on PCI && EXPERIMENTAL depends on PCI && EXPERIMENTAL && HOTPLUG
select HOTPLUG
---help--- ---help---
Say Y here if you have a motherboard with a PCI Hotplug controller. Say Y here if you have a motherboard with a PCI Hotplug controller.
This allows you to add and remove PCI cards while the machine is This allows you to add and remove PCI cards while the machine is
......
...@@ -6,7 +6,7 @@ menu "PCCARD (PCMCIA/CardBus) support" ...@@ -6,7 +6,7 @@ menu "PCCARD (PCMCIA/CardBus) support"
config PCCARD config PCCARD
tristate "PCCard (PCMCIA/CardBus) support" tristate "PCCard (PCMCIA/CardBus) support"
select HOTPLUG depends on HOTPLUG
---help--- ---help---
Say Y here if you want to attach PCMCIA- or PC-cards to your Linux Say Y here if you want to attach PCMCIA- or PC-cards to your Linux
computer. These are credit-card size devices such as network cards, computer. These are credit-card size devices such as network cards,
......
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