diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-24 21:52:27 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-24 21:52:27 +0100 |
commit | 87b203079ed949de52f0d92aeae20e5e0116c12f (patch) | |
tree | 1878756f936963822ed2d51a15db1da5814973e7 /drivers/acpi/Kconfig | |
parent | 58105ef1857112a186696c9b8957020090226a28 (diff) | |
parent | a852cbfaaf8122827602027b1614971cfd832304 (diff) | |
download | talos-op-linux-87b203079ed949de52f0d92aeae20e5e0116c12f.tar.gz talos-op-linux-87b203079ed949de52f0d92aeae20e5e0116c12f.zip |
Merge branch 'x86/core' into core/percpu
Diffstat (limited to 'drivers/acpi/Kconfig')
-rw-r--r-- | drivers/acpi/Kconfig | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index a7799a99f2d9..8a851d0f4384 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -254,13 +254,6 @@ config ACPI_PCI_SLOT help you correlate PCI bus addresses with the physical geography of your slots. If you are unsure, say N. -config ACPI_SYSTEM - bool - default y - help - This driver will enable your system to shut down using ACPI, and - dump your ACPI DSDT table using /proc/acpi/dsdt. - config X86_PM_TIMER bool "Power Management Timer Support" if EMBEDDED depends on X86 |