diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
| commit | c973b112c76c9d8fd042991128f218a738cc8d0a (patch) | |
| tree | e813b0da5d0a0e19e06de6462d145a29ad683026 /drivers/acpi/Kconfig | |
| parent | c5fbc3966f48279dbebfde10248c977014aa9988 (diff) | |
| parent | 00dd1e433967872f3997a45d5adf35056fdf2f56 (diff) | |
Merge with /shiny/git/linux-2.6/.git
Diffstat (limited to 'drivers/acpi/Kconfig')
| -rw-r--r-- | drivers/acpi/Kconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 986410e7b483..ba13896cae40 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig | |||
| @@ -133,9 +133,10 @@ config ACPI_HOTKEY | |||
| 133 | depends on ACPI_INTERPRETER | 133 | depends on ACPI_INTERPRETER |
| 134 | depends on EXPERIMENTAL | 134 | depends on EXPERIMENTAL |
| 135 | depends on !IA64_SGI_SN | 135 | depends on !IA64_SGI_SN |
| 136 | default m | 136 | default n |
| 137 | help | 137 | help |
| 138 | ACPI generic hotkey | 138 | Experimental consolidated hotkey driver. |
| 139 | If you are unsure, say N. | ||
| 139 | 140 | ||
| 140 | config ACPI_FAN | 141 | config ACPI_FAN |
| 141 | tristate "Fan" | 142 | tristate "Fan" |