diff options
| author | Len Brown <len.brown@intel.com> | 2007-02-16 22:11:02 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-02-16 22:11:02 -0500 |
| commit | 8800c0ebf5e8363dab66647512dcef5b83203dec (patch) | |
| tree | 2576b0ab6177554409ab7e62fb411c6b5487d64d /drivers/acpi/Kconfig | |
| parent | 9cdd79c9b99873d600d397fda012fc3f57cc2776 (diff) | |
| parent | 5ee6edbcde4d3b14e4e03d4b331df1099a34aa8d (diff) | |
Pull remove-hotkey into release branch
Diffstat (limited to 'drivers/acpi/Kconfig')
| -rw-r--r-- | drivers/acpi/Kconfig | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 2d21fed402b5..e942ffe8b57e 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig | |||
| @@ -133,15 +133,6 @@ config ACPI_VIDEO | |||
| 133 | Note that this is an ref. implementation only. It may or may not work | 133 | Note that this is an ref. implementation only. It may or may not work |
| 134 | for your integrated video device. | 134 | for your integrated video device. |
| 135 | 135 | ||
| 136 | config ACPI_HOTKEY | ||
| 137 | tristate "Generic Hotkey (EXPERIMENTAL)" | ||
| 138 | depends on EXPERIMENTAL | ||
| 139 | depends on X86 | ||
| 140 | default n | ||
| 141 | help | ||
| 142 | Experimental consolidated hotkey driver. | ||
| 143 | If you are unsure, say N. | ||
| 144 | |||
| 145 | config ACPI_FAN | 136 | config ACPI_FAN |
| 146 | tristate "Fan" | 137 | tristate "Fan" |
| 147 | default y | 138 | default y |