summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/Kconfig
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-02-16 22:11:02 -0500
committerLen Brown <len.brown@intel.com>2007-02-16 22:11:02 -0500
commit8800c0ebf5e8363dab66647512dcef5b83203dec (patch)
tree2576b0ab6177554409ab7e62fb411c6b5487d64d /drivers/acpi/Kconfig
parent9cdd79c9b99873d600d397fda012fc3f57cc2776 (diff)
parent5ee6edbcde4d3b14e4e03d4b331df1099a34aa8d (diff)
downloadop-kernel-dev-8800c0ebf5e8363dab66647512dcef5b83203dec.zip
op-kernel-dev-8800c0ebf5e8363dab66647512dcef5b83203dec.tar.gz
Pull remove-hotkey into release branch
Diffstat (limited to 'drivers/acpi/Kconfig')
-rw-r--r--drivers/acpi/Kconfig9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 2d21fed..e942ffe 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -133,15 +133,6 @@ config ACPI_VIDEO
Note that this is an ref. implementation only. It may or may not work
for your integrated video device.
-config ACPI_HOTKEY
- tristate "Generic Hotkey (EXPERIMENTAL)"
- depends on EXPERIMENTAL
- depends on X86
- default n
- help
- Experimental consolidated hotkey driver.
- If you are unsure, say N.
-
config ACPI_FAN
tristate "Fan"
default y
OpenPOWER on IntegriCloud