diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-02-15 17:44:01 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-02-15 17:44:01 -0700 |
| commit | ad06bff31fbf0aba4e5faae936e12292a7972b05 (patch) | |
| tree | 7a3f2a4da501c10e5821f6e1930a78572ce66d7c /drivers/acpi/Kconfig | |
| parent | 20f24208f631141bafe57ce5bcc8f2e7f3c41aae (diff) | |
| parent | ab1a2e038ff2336502e95ec6492c0364a9fc70d0 (diff) | |
| download | linux-stable-ad06bff31fbf0aba4e5faae936e12292a7972b05.tar.gz linux-stable-ad06bff31fbf0aba4e5faae936e12292a7972b05.tar.bz2 linux-stable-ad06bff31fbf0aba4e5faae936e12292a7972b05.zip | |
Merge branch 'pci/jiang-pci_slot-kconfig' into next
* pci/jiang-pci_slot-kconfig:
ACPI / PCI: Make pci_slot built-in only, not a module
Diffstat (limited to 'drivers/acpi/Kconfig')
| -rw-r--r-- | drivers/acpi/Kconfig | 5 |
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 is about half of the penalty and is rarely useful. config ACPI_PCI_SLOT - tristate "PCI slot detection driver" + bool "PCI slot detection driver" depends on SYSFS default n help @@ -317,9 +317,6 @@ config ACPI_PCI_SLOT i.e., segment/bus/device/function tuples, with physical slots in the system. If you are unsure, say N. - To compile this driver as a module, choose M here: - the module will be called pci_slot. - config X86_PM_TIMER bool "Power Management Timer Support" if EXPERT depends on X86 |