Pull video into release branch

[pandora-kernel.git] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index eb4855f..408b451 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -2,16 +2,12 @@
 # ACPI Configuration
 #
 
 # ACPI Configuration
 #
 

-menu "ACPI (Advanced Configuration and Power Interface) Support"
+menuconfig ACPI
+       bool "ACPI Support (Advanced Configuration and Power Interface) Support"

        depends on !X86_NUMAQ
        depends on !X86_VISWS
        depends on !IA64_HP_SIM
        depends on IA64 || X86
        depends on !X86_NUMAQ
        depends on !X86_VISWS
        depends on !IA64_HP_SIM
        depends on IA64 || X86

-       depends on PM
-
-config ACPI
-       bool "ACPI Support"
-       depends on IA64 || X86

        depends on PCI
        depends on PM
        select PNP
        depends on PCI
        depends on PM
        select PNP


@@ -49,7 +45,6 @@ if ACPI
 config ACPI_SLEEP
        bool "Sleep States"
        depends on X86 && (!SMP || SUSPEND_SMP)
 config ACPI_SLEEP
        bool "Sleep States"
        depends on X86 && (!SMP || SUSPEND_SMP)

-       depends on PM

        default y
        ---help---
          This option adds support for ACPI suspend states. 
        default y
        ---help---
          This option adds support for ACPI suspend states. 


@@ -82,7 +77,6 @@ config ACPI_SLEEP_PROC_SLEEP
 
 config ACPI_PROCFS
        bool "Procfs interface (deprecated)"
 
 config ACPI_PROCFS
        bool "Procfs interface (deprecated)"

-       depends on ACPI

        default y
        ---help---
          The Procfs interface for ACPI is made optional for backward compatibility.
        default y
        ---help---
          The Procfs interface for ACPI is made optional for backward compatibility.


@@ -280,6 +274,14 @@ config ACPI_DEBUG
          of verbosity. Saying Y enables these statements. This will increase
          your kernel size by around 50K.
 
          of verbosity. Saying Y enables these statements. This will increase
          your kernel size by around 50K.
 

+config ACPI_DEBUG_FUNC_TRACE
+       bool "Additionally enable ACPI function tracing"
+       default n
+       depends on ACPI_DEBUG
+       help
+         ACPI Debug Statements slow down ACPI processing. Function trace
+         is about half of the penalty and is rarely useful.
+

 config ACPI_EC
        bool
        default y
 config ACPI_EC
        bool
        default y


@@ -330,7 +332,6 @@ config ACPI_CONTAINER
 
 config ACPI_HOTPLUG_MEMORY
        tristate "Memory Hotplug"
 
 config ACPI_HOTPLUG_MEMORY
        tristate "Memory Hotplug"

-       depends on ACPI

        depends on MEMORY_HOTPLUG
        default n
        help
        depends on MEMORY_HOTPLUG
        default n
        help


@@ -359,5 +360,3 @@ config ACPI_SBS
          to today's ACPI "Control Method" battery.
 
 endif  # ACPI
          to today's ACPI "Control Method" battery.
 
 endif  # ACPI

-
-endmenu