diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2013-07-24 19:36:31 +0200 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-07-25 22:11:06 +0200 |
commit | 7cd29f4b22be3c3468871f5240621a32d9bc903a (patch) | |
tree | ac85b85cb83e3b8e7e0c2963f0b5c778f0fd0a86 /arch/sh | |
parent | PCI: pciehp: Fix null pointer deref when hot-removing SR-IOV device (diff) | |
download | linux-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/sh')
-rw-r--r-- | arch/sh/configs/sh03_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/configs/sh03_defconfig b/arch/sh/configs/sh03_defconfig index 2051821724c6..0cf4097b71e8 100644 --- a/arch/sh/configs/sh03_defconfig +++ b/arch/sh/configs/sh03_defconfig @@ -22,7 +22,7 @@ CONFIG_PREEMPT=y CONFIG_CMDLINE_OVERWRITE=y CONFIG_CMDLINE="console=ttySC1,115200 mem=64M root=/dev/nfs" CONFIG_PCI=y -CONFIG_HOTPLUG_PCI=m +CONFIG_HOTPLUG_PCI=y CONFIG_BINFMT_MISC=y CONFIG_NET=y CONFIG_PACKET=y |