summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs/ppc64e_defconfig
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2013-07-24 19:36:31 +0200
committerBjorn Helgaas <bhelgaas@google.com>2013-07-25 22:11:06 +0200
commit7cd29f4b22be3c3468871f5240621a32d9bc903a (patch)
treeac85b85cb83e3b8e7e0c2963f0b5c778f0fd0a86 /arch/powerpc/configs/ppc64e_defconfig
parentPCI: pciehp: Fix null pointer deref when hot-removing SR-IOV device (diff)
downloadlinux-7cd29f4b22be3c3468871f5240621a32d9bc903a.tar.xz
linux-7cd29f4b22be3c3468871f5240621a32d9bc903a.zip
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: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Acked-by: Yinghai Lu <yinghai@kernel.org>
Diffstat (limited to 'arch/powerpc/configs/ppc64e_defconfig')
-rw-r--r--arch/powerpc/configs/ppc64e_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/configs/ppc64e_defconfig b/arch/powerpc/configs/ppc64e_defconfig
index 4b20f76172e2..0085dc4642c5 100644
--- a/arch/powerpc/configs/ppc64e_defconfig
+++ b/arch/powerpc/configs/ppc64e_defconfig
@@ -32,7 +32,7 @@ CONFIG_IRQ_ALL_CPUS=y
CONFIG_SPARSEMEM_MANUAL=y
CONFIG_PCI_MSI=y
CONFIG_PCCARD=y
-CONFIG_HOTPLUG_PCI=m
+CONFIG_HOTPLUG_PCI=y
CONFIG_PACKET=y
CONFIG_UNIX=y
CONFIG_XFRM_USER=m