summaryrefslogtreecommitdiff
path: root/drivers/acpi/Kconfig
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-11-16 18:45:00 +0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-11-16 18:45:00 +0400
commiteb64821243cd6f72646b3ffb9ee2245f83256b32 (patch)
tree6b57877b8d8ae33b160103ecfa362a2867909b20 /drivers/acpi/Kconfig
parenta7d2472d8145f6d0729317e3cabe2d0f1a14a87a (diff)
parent4c47cb197e136912f4eecc68ab9410487f2df831 (diff)
downloadlinux-eb64821243cd6f72646b3ffb9ee2245f83256b32.tar.xz
Merge branch 'acpi-config'
* acpi-config: ACPI: delete CONFIG_ACPI_BLACKLIST_YEAR
Diffstat (limited to 'drivers/acpi/Kconfig')
-rw-r--r--drivers/acpi/Kconfig11
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index c95df0b8c880..5d9248526d78 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -235,17 +235,6 @@ config ACPI_INITRD_TABLE_OVERRIDE
initrd, therefore it's safe to say Y.
See Documentation/acpi/initrd_table_override.txt for details
-config ACPI_BLACKLIST_YEAR
- int "Disable ACPI for systems before Jan 1st this year" if X86_32
- default 0
- help
- Enter a 4-digit year, e.g., 2001, to disable ACPI by default
- on platforms with DMI BIOS date before January 1st that year.
- "acpi=force" can be used to override this mechanism.
-
- Enter 0 to disable this mechanism and allow ACPI to
- run by default no matter what the year. (default)
-
config ACPI_DEBUG
bool "Debug Statements"
default n