Commit 7cd29f4b authored by Bjorn Helgaas's avatar Bjorn Helgaas

PCI: hotplug: Convert to be builtin only, not modular

Convert CONFIG_HOTPLUG_PCI from tristate to bool.  This only affects
the hotplug core; several of the hotplug drivers can still be modules.
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarYinghai Lu <yinghai@kernel.org>
parent 29ed1f29
...@@ -31,7 +31,7 @@ CONFIG_ACPI_FAN=m ...@@ -31,7 +31,7 @@ CONFIG_ACPI_FAN=m
CONFIG_ACPI_DOCK=y CONFIG_ACPI_DOCK=y
CONFIG_ACPI_PROCESSOR=m CONFIG_ACPI_PROCESSOR=m
CONFIG_ACPI_CONTAINER=m CONFIG_ACPI_CONTAINER=m
CONFIG_HOTPLUG_PCI=m CONFIG_HOTPLUG_PCI=y
CONFIG_HOTPLUG_PCI_ACPI=m CONFIG_HOTPLUG_PCI_ACPI=m
CONFIG_PACKET=y CONFIG_PACKET=y
CONFIG_UNIX=y CONFIG_UNIX=y
......
...@@ -25,7 +25,7 @@ CONFIG_ACPI_BUTTON=m ...@@ -25,7 +25,7 @@ CONFIG_ACPI_BUTTON=m
CONFIG_ACPI_FAN=m CONFIG_ACPI_FAN=m
CONFIG_ACPI_PROCESSOR=m CONFIG_ACPI_PROCESSOR=m
CONFIG_ACPI_CONTAINER=m CONFIG_ACPI_CONTAINER=m
CONFIG_HOTPLUG_PCI=m CONFIG_HOTPLUG_PCI=y
CONFIG_HOTPLUG_PCI_ACPI=m CONFIG_HOTPLUG_PCI_ACPI=m
CONFIG_PACKET=y CONFIG_PACKET=y
CONFIG_UNIX=y CONFIG_UNIX=y
......
...@@ -31,7 +31,7 @@ CONFIG_ACPI_BUTTON=m ...@@ -31,7 +31,7 @@ CONFIG_ACPI_BUTTON=m
CONFIG_ACPI_FAN=m CONFIG_ACPI_FAN=m
CONFIG_ACPI_PROCESSOR=m CONFIG_ACPI_PROCESSOR=m
CONFIG_ACPI_CONTAINER=m CONFIG_ACPI_CONTAINER=m
CONFIG_HOTPLUG_PCI=m CONFIG_HOTPLUG_PCI=y
CONFIG_HOTPLUG_PCI_ACPI=m CONFIG_HOTPLUG_PCI_ACPI=m
CONFIG_PACKET=y CONFIG_PACKET=y
CONFIG_UNIX=y CONFIG_UNIX=y
......
...@@ -32,7 +32,7 @@ CONFIG_ACPI_BUTTON=m ...@@ -32,7 +32,7 @@ CONFIG_ACPI_BUTTON=m
CONFIG_ACPI_FAN=m CONFIG_ACPI_FAN=m
CONFIG_ACPI_PROCESSOR=m CONFIG_ACPI_PROCESSOR=m
CONFIG_ACPI_CONTAINER=m CONFIG_ACPI_CONTAINER=m
CONFIG_HOTPLUG_PCI=m CONFIG_HOTPLUG_PCI=y
CONFIG_HOTPLUG_PCI_ACPI=m CONFIG_HOTPLUG_PCI_ACPI=m
CONFIG_PACKET=y CONFIG_PACKET=y
CONFIG_UNIX=y CONFIG_UNIX=y
......
...@@ -58,7 +58,7 @@ CONFIG_SCHED_SMT=y ...@@ -58,7 +58,7 @@ CONFIG_SCHED_SMT=y
CONFIG_PPC_DENORMALISATION=y CONFIG_PPC_DENORMALISATION=y
CONFIG_PCCARD=y CONFIG_PCCARD=y
CONFIG_ELECTRA_CF=y CONFIG_ELECTRA_CF=y
CONFIG_HOTPLUG_PCI=m CONFIG_HOTPLUG_PCI=y
CONFIG_HOTPLUG_PCI_RPA=m CONFIG_HOTPLUG_PCI_RPA=m
CONFIG_HOTPLUG_PCI_RPA_DLPAR=m CONFIG_HOTPLUG_PCI_RPA_DLPAR=m
CONFIG_PACKET=y CONFIG_PACKET=y
......
...@@ -32,7 +32,7 @@ CONFIG_IRQ_ALL_CPUS=y ...@@ -32,7 +32,7 @@ CONFIG_IRQ_ALL_CPUS=y
CONFIG_SPARSEMEM_MANUAL=y CONFIG_SPARSEMEM_MANUAL=y
CONFIG_PCI_MSI=y CONFIG_PCI_MSI=y
CONFIG_PCCARD=y CONFIG_PCCARD=y
CONFIG_HOTPLUG_PCI=m CONFIG_HOTPLUG_PCI=y
CONFIG_PACKET=y CONFIG_PACKET=y
CONFIG_UNIX=y CONFIG_UNIX=y
CONFIG_XFRM_USER=m CONFIG_XFRM_USER=m
......
...@@ -53,7 +53,7 @@ CONFIG_PPC_64K_PAGES=y ...@@ -53,7 +53,7 @@ CONFIG_PPC_64K_PAGES=y
CONFIG_PPC_SUBPAGE_PROT=y CONFIG_PPC_SUBPAGE_PROT=y
CONFIG_SCHED_SMT=y CONFIG_SCHED_SMT=y
CONFIG_PPC_DENORMALISATION=y CONFIG_PPC_DENORMALISATION=y
CONFIG_HOTPLUG_PCI=m CONFIG_HOTPLUG_PCI=y
CONFIG_HOTPLUG_PCI_RPA=m CONFIG_HOTPLUG_PCI_RPA=m
CONFIG_HOTPLUG_PCI_RPA_DLPAR=m CONFIG_HOTPLUG_PCI_RPA_DLPAR=m
CONFIG_PACKET=y CONFIG_PACKET=y
......
...@@ -22,7 +22,7 @@ CONFIG_PREEMPT=y ...@@ -22,7 +22,7 @@ CONFIG_PREEMPT=y
CONFIG_CMDLINE_OVERWRITE=y CONFIG_CMDLINE_OVERWRITE=y
CONFIG_CMDLINE="console=ttySC1,115200 mem=64M root=/dev/nfs" CONFIG_CMDLINE="console=ttySC1,115200 mem=64M root=/dev/nfs"
CONFIG_PCI=y CONFIG_PCI=y
CONFIG_HOTPLUG_PCI=m CONFIG_HOTPLUG_PCI=y
CONFIG_BINFMT_MISC=y CONFIG_BINFMT_MISC=y
CONFIG_NET=y CONFIG_NET=y
CONFIG_PACKET=y CONFIG_PACKET=y
......
...@@ -3,16 +3,13 @@ ...@@ -3,16 +3,13 @@
# #
menuconfig HOTPLUG_PCI menuconfig HOTPLUG_PCI
tristate "Support for PCI Hotplug" bool "Support for PCI Hotplug"
depends on PCI && SYSFS depends on PCI && SYSFS
---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
powered up and running. powered up and running.
To compile this driver as a module, choose M here: the
module will be called pci_hotplug.
When in doubt, say N. When in doubt, say N.
if HOTPLUG_PCI if HOTPLUG_PCI
......
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