diff options
| author | Andrew Morton <akpm@osdl.org> | 2006-07-10 07:43:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-10 16:24:12 -0400 |
| commit | 135c294fa3660b979d71bbce1611f9ca721077b5 (patch) | |
| tree | cdc0bf385c961493e54c3c1c539efe23d15de68d | |
| parent | b3cf257623fabd8f1ee6700a6d328cc1c5da5a1d (diff) | |
[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: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/base/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/pci/hotplug/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/pcmcia/Kconfig | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig index 80502dc6ed66..0b4e22436935 100644 --- a/drivers/base/Kconfig +++ b/drivers/base/Kconfig | |||
| @@ -20,7 +20,7 @@ config PREVENT_FIRMWARE_BUILD | |||
| 20 | 20 | ||
| 21 | config FW_LOADER | 21 | config FW_LOADER |
| 22 | tristate "Userspace firmware loading support" | 22 | tristate "Userspace firmware loading support" |
| 23 | select HOTPLUG | 23 | depends on HOTPLUG |
| 24 | ---help--- | 24 | ---help--- |
| 25 | This option is provided for the case where no in-kernel-tree modules | 25 | This option is provided for the case where no in-kernel-tree modules |
| 26 | require userspace firmware loading support, but a module built outside | 26 | require userspace firmware loading support, but a module built outside |
diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig index 222a1cc4aa28..e94099c3e82e 100644 --- a/drivers/pci/hotplug/Kconfig +++ b/drivers/pci/hotplug/Kconfig | |||
| @@ -6,8 +6,7 @@ menu "PCI Hotplug Support" | |||
| 6 | 6 | ||
| 7 | config HOTPLUG_PCI | 7 | config HOTPLUG_PCI |
| 8 | tristate "Support for PCI Hotplug (EXPERIMENTAL)" | 8 | tristate "Support for PCI Hotplug (EXPERIMENTAL)" |
| 9 | depends on PCI && EXPERIMENTAL | 9 | depends on PCI && EXPERIMENTAL && HOTPLUG |
| 10 | select HOTPLUG | ||
| 11 | ---help--- | 10 | ---help--- |
| 12 | Say Y here if you have a motherboard with a PCI Hotplug controller. | 11 | Say Y here if you have a motherboard with a PCI Hotplug controller. |
| 13 | This allows you to add and remove PCI cards while the machine is | 12 | This allows you to add and remove PCI cards while the machine is |
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig index 61cb4b29f55c..35f88649d3b7 100644 --- a/drivers/pcmcia/Kconfig +++ b/drivers/pcmcia/Kconfig | |||
| @@ -6,7 +6,7 @@ menu "PCCARD (PCMCIA/CardBus) support" | |||
| 6 | 6 | ||
| 7 | config PCCARD | 7 | config PCCARD |
| 8 | tristate "PCCard (PCMCIA/CardBus) support" | 8 | tristate "PCCard (PCMCIA/CardBus) support" |
| 9 | select HOTPLUG | 9 | depends on HOTPLUG |
| 10 | ---help--- | 10 | ---help--- |
| 11 | Say Y here if you want to attach PCMCIA- or PC-cards to your Linux | 11 | Say Y here if you want to attach PCMCIA- or PC-cards to your Linux |
| 12 | computer. These are credit-card size devices such as network cards, | 12 | computer. These are credit-card size devices such as network cards, |