diff options
| author | Jiang Liu | 2013-04-12 07:44:25 +0200 |
|---|---|---|
| committer | Bjorn Helgaas | 2013-04-12 23:38:25 +0200 |
| commit | 6037a803b05eef9943fb64982e19964007fb7478 (patch) | |
| tree | 3e15b1dfef971b65175c665f97d3ea70507423a8 /drivers/pci/hotplug/Kconfig | |
| parent | PCI/ACPI: Handle PCI slot devices when creating/destroying PCI buses (diff) | |
| download | kernel-qcow2-linux-6037a803b05eef9943fb64982e19964007fb7478.tar.gz kernel-qcow2-linux-6037a803b05eef9943fb64982e19964007fb7478.tar.xz kernel-qcow2-linux-6037a803b05eef9943fb64982e19964007fb7478.zip | |
PCI: acpiphp: Convert acpiphp to be builtin only, not modular
Convert acpiphp to be builtin only, with no module option.
Previously, when HOTPLUG_PCI_ACPI=m, users could disable acpiphp by
removing the module or preventing it from loading. That can't be done
if acpiphp is builtin statically, so this adds an "acpiphp.disable"
kernel parameter. If a user needs to use this parameter, it is a bug,
and we want to hear about it.
[bhelgaas: fold in acpiphp.disable here, remove documentation]
Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci/hotplug/Kconfig')
| -rw-r--r-- | drivers/pci/hotplug/Kconfig | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig index 13e9e63a7266..9fcb87f353d4 100644 --- a/drivers/pci/hotplug/Kconfig +++ b/drivers/pci/hotplug/Kconfig @@ -52,15 +52,12 @@ config HOTPLUG_PCI_IBM When in doubt, say N. config HOTPLUG_PCI_ACPI - tristate "ACPI PCI Hotplug driver" - depends on (!ACPI_DOCK && ACPI) || (ACPI_DOCK) + bool "ACPI PCI Hotplug driver" + depends on HOTPLUG_PCI=y && ((!ACPI_DOCK && ACPI) || (ACPI_DOCK)) help Say Y here if you have a system that supports PCI Hotplug using ACPI. - To compile this driver as a module, choose M here: the - module will be called acpiphp. - When in doubt, say N. config HOTPLUG_PCI_ACPI_IBM |