From 0cd321e2d373ff058f3434b9eb4a6ddf131e3990 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Mon, 10 Jul 2006 04:43:48 -0700 Subject: [PATCH] --- yaml --- r: 32205 b: refs/heads/master c: 135c294fa3660b979d71bbce1611f9ca721077b5 h: refs/heads/master i: 32203: 14d439df36115aa7e3c703c4e31cb386d217d33d v: v3 --- [refs] | 2 +- trunk/drivers/base/Kconfig | 2 +- trunk/drivers/pci/hotplug/Kconfig | 3 +-- trunk/drivers/pcmcia/Kconfig | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ec4b7fa4ed73..f27ecdd260d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b3cf257623fabd8f1ee6700a6d328cc1c5da5a1d +refs/heads/master: 135c294fa3660b979d71bbce1611f9ca721077b5 diff --git a/trunk/drivers/base/Kconfig b/trunk/drivers/base/Kconfig index 80502dc6ed66..0b4e22436935 100644 --- a/trunk/drivers/base/Kconfig +++ b/trunk/drivers/base/Kconfig @@ -20,7 +20,7 @@ config PREVENT_FIRMWARE_BUILD config FW_LOADER tristate "Userspace firmware loading support" - select HOTPLUG + depends on HOTPLUG ---help--- This option is provided for the case where no in-kernel-tree modules require userspace firmware loading support, but a module built outside diff --git a/trunk/drivers/pci/hotplug/Kconfig b/trunk/drivers/pci/hotplug/Kconfig index 222a1cc4aa28..e94099c3e82e 100644 --- a/trunk/drivers/pci/hotplug/Kconfig +++ b/trunk/drivers/pci/hotplug/Kconfig @@ -6,8 +6,7 @@ menu "PCI Hotplug Support" config HOTPLUG_PCI tristate "Support for PCI Hotplug (EXPERIMENTAL)" - depends on PCI && EXPERIMENTAL - select HOTPLUG + depends on PCI && EXPERIMENTAL && HOTPLUG ---help--- 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 diff --git a/trunk/drivers/pcmcia/Kconfig b/trunk/drivers/pcmcia/Kconfig index 61cb4b29f55c..35f88649d3b7 100644 --- a/trunk/drivers/pcmcia/Kconfig +++ b/trunk/drivers/pcmcia/Kconfig @@ -6,7 +6,7 @@ menu "PCCARD (PCMCIA/CardBus) support" config PCCARD tristate "PCCard (PCMCIA/CardBus) support" - select HOTPLUG + depends on HOTPLUG ---help--- 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,