diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
| commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
| tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /drivers/pci/hotplug | |
| parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'drivers/pci/hotplug')
| -rw-r--r-- | drivers/pci/hotplug/Kconfig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig index 222a1cc4aa28..3fae77ffb2fa 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 |
| @@ -77,7 +76,7 @@ config HOTPLUG_PCI_IBM | |||
| 77 | 76 | ||
| 78 | config HOTPLUG_PCI_ACPI | 77 | config HOTPLUG_PCI_ACPI |
| 79 | tristate "ACPI PCI Hotplug driver" | 78 | tristate "ACPI PCI Hotplug driver" |
| 80 | depends on ACPI && HOTPLUG_PCI | 79 | depends on ACPI_DOCK && HOTPLUG_PCI |
| 81 | help | 80 | help |
| 82 | Say Y here if you have a system that supports PCI Hotplug using | 81 | Say Y here if you have a system that supports PCI Hotplug using |
| 83 | ACPI. | 82 | ACPI. |