aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/Kconfig
diff options
context:
space:
mode:
authorJiang Liu <liuj97@gmail.com>2013-01-18 11:07:42 -0500
committerBjorn Helgaas <bhelgaas@google.com>2013-02-15 13:35:05 -0500
commitab1a2e038ff2336502e95ec6492c0364a9fc70d0 (patch)
treef69e59b53ed0b01eb4bc04c78ca5e38d2d5919ac /drivers/acpi/Kconfig
parenta2766602ac6885f9514abd97821984cd152cdad3 (diff)
ACPI / PCI: Make pci_slot built-in only, not a module
As discussed in thread at https://patchwork.kernel.org/patch/1946851/, there's no value in supporting CONFIG_ACPI_PCI_SLOT=m any more. So change Kconfig and code to only support building pci_slot as built-in driver. Signed-off-by: Jiang Liu <jiang.liu@huawei.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/acpi/Kconfig')
-rw-r--r--drivers/acpi/Kconfig5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 38c5078da11d..27fde5e8d31a 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -308,7 +308,7 @@ config ACPI_DEBUG_FUNC_TRACE
308 is about half of the penalty and is rarely useful. 308 is about half of the penalty and is rarely useful.
309 309
310config ACPI_PCI_SLOT 310config ACPI_PCI_SLOT
311 tristate "PCI slot detection driver" 311 bool "PCI slot detection driver"
312 depends on SYSFS 312 depends on SYSFS
313 default n 313 default n
314 help 314 help
@@ -317,9 +317,6 @@ config ACPI_PCI_SLOT
317 i.e., segment/bus/device/function tuples, with physical slots in 317 i.e., segment/bus/device/function tuples, with physical slots in
318 the system. If you are unsure, say N. 318 the system. If you are unsure, say N.
319 319
320 To compile this driver as a module, choose M here:
321 the module will be called pci_slot.
322
323config X86_PM_TIMER 320config X86_PM_TIMER
324 bool "Power Management Timer Support" if EXPERT 321 bool "Power Management Timer Support" if EXPERT
325 depends on X86 322 depends on X86