diff options
Diffstat (limited to 'drivers/acpi/Kconfig')
-rw-r--r-- | drivers/acpi/Kconfig | 37 |
1 files changed, 11 insertions, 26 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index da49b006bcc5..b0243fd55ac0 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig | |||
@@ -42,7 +42,7 @@ if ACPI | |||
42 | 42 | ||
43 | config ACPI_SLEEP | 43 | config ACPI_SLEEP |
44 | bool | 44 | bool |
45 | depends on PM_SLEEP | 45 | depends on SUSPEND || HIBERNATION |
46 | default y | 46 | default y |
47 | 47 | ||
48 | config ACPI_PROCFS | 48 | config ACPI_PROCFS |
@@ -157,18 +157,11 @@ config ACPI_FAN | |||
157 | applications to perform basic fan control (on, off, status). | 157 | applications to perform basic fan control (on, off, status). |
158 | 158 | ||
159 | config ACPI_DOCK | 159 | config ACPI_DOCK |
160 | tristate "Dock" | 160 | bool "Dock" |
161 | depends on EXPERIMENTAL | 161 | depends on EXPERIMENTAL |
162 | help | 162 | help |
163 | This driver adds support for ACPI controlled docking stations | 163 | This driver adds support for ACPI controlled docking stations and removable |
164 | 164 | drive bays such as the IBM ultrabay or the Dell Module Bay. | |
165 | config ACPI_BAY | ||
166 | tristate "Removable Drive Bay (EXPERIMENTAL)" | ||
167 | depends on EXPERIMENTAL | ||
168 | depends on ACPI_DOCK | ||
169 | help | ||
170 | This driver adds support for ACPI controlled removable drive | ||
171 | bays such as the IBM ultrabay or the Dell Module Bay. | ||
172 | 165 | ||
173 | config ACPI_PROCESSOR | 166 | config ACPI_PROCESSOR |
174 | tristate "Processor" | 167 | tristate "Processor" |
@@ -319,9 +312,13 @@ config ACPI_DEBUG | |||
319 | bool "Debug Statements" | 312 | bool "Debug Statements" |
320 | default n | 313 | default n |
321 | help | 314 | help |
322 | The ACPI driver can optionally report errors with a great deal | 315 | The ACPI subsystem can produce debug output. Saying Y enables this |
323 | of verbosity. Saying Y enables these statements. This will increase | 316 | output and increases the kernel size by around 50K. |
324 | your kernel size by around 50K. | 317 | |
318 | Use the acpi.debug_layer and acpi.debug_level kernel command-line | ||
319 | parameters documented in Documentation/acpi/debug.txt and | ||
320 | Documentation/kernel-parameters.txt to control the type and | ||
321 | amount of debug output. | ||
325 | 322 | ||
326 | config ACPI_DEBUG_FUNC_TRACE | 323 | config ACPI_DEBUG_FUNC_TRACE |
327 | bool "Additionally enable ACPI function tracing" | 324 | bool "Additionally enable ACPI function tracing" |
@@ -331,14 +328,6 @@ config ACPI_DEBUG_FUNC_TRACE | |||
331 | ACPI Debug Statements slow down ACPI processing. Function trace | 328 | ACPI Debug Statements slow down ACPI processing. Function trace |
332 | is about half of the penalty and is rarely useful. | 329 | is about half of the penalty and is rarely useful. |
333 | 330 | ||
334 | config ACPI_EC | ||
335 | bool | ||
336 | default y | ||
337 | help | ||
338 | This driver is required on some systems for the proper operation of | ||
339 | the battery and thermal drivers. If you are compiling for a | ||
340 | mobile system, say Y. | ||
341 | |||
342 | config ACPI_PCI_SLOT | 331 | config ACPI_PCI_SLOT |
343 | tristate "PCI slot detection driver" | 332 | tristate "PCI slot detection driver" |
344 | default n | 333 | default n |
@@ -348,10 +337,6 @@ config ACPI_PCI_SLOT | |||
348 | help you correlate PCI bus addresses with the physical geography | 337 | help you correlate PCI bus addresses with the physical geography |
349 | of your slots. If you are unsure, say N. | 338 | of your slots. If you are unsure, say N. |
350 | 339 | ||
351 | config ACPI_POWER | ||
352 | bool | ||
353 | default y | ||
354 | |||
355 | config ACPI_SYSTEM | 340 | config ACPI_SYSTEM |
356 | bool | 341 | bool |
357 | default y | 342 | default y |