Fix FADT parsing

[linux-2.6] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index ccf6ea95f68c76dc27d5eb9f06b15e3cd384d9d6..bba867391a85bff4c08f9e61632026084cf59cea 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -4,8 +4,6 @@
 
 menuconfig ACPI
        bool "ACPI (Advanced Configuration and Power Interface) Support"
 
 menuconfig ACPI
        bool "ACPI (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 PCI
        depends on !IA64_HP_SIM
        depends on IA64 || X86
        depends on PCI


@@ -68,26 +66,28 @@ config ACPI_PROCFS
 
          Say N to delete /proc/acpi/ files that have moved to /sys/
 config ACPI_PROCFS_POWER
 
          Say N to delete /proc/acpi/ files that have moved to /sys/
 config ACPI_PROCFS_POWER

-       bool "Deprecated power /proc/acpi folders"
+       bool "Deprecated power /proc/acpi directories"

        depends on PROC_FS
        default y
        ---help---
          For backwards compatibility, this option allows
        depends on PROC_FS
        default y
        ---help---
          For backwards compatibility, this option allows

-          deprecated power /proc/acpi/ folders to exist, even when
+          deprecated power /proc/acpi/ directories to exist, even when

           they have been replaced by functions in /sys.
           they have been replaced by functions in /sys.

-          The deprecated folders (and their replacements) include:
+          The deprecated directories (and their replacements) include:

          /proc/acpi/battery/* (/sys/class/power_supply/*)
          /proc/acpi/ac_adapter/* (sys/class/power_supply/*)
          /proc/acpi/battery/* (/sys/class/power_supply/*)
          /proc/acpi/ac_adapter/* (sys/class/power_supply/*)

-         This option has no effect on /proc/acpi/ folders
+         This option has no effect on /proc/acpi/ directories

          and functions, which do not yet exist in /sys
 
          and functions, which do not yet exist in /sys
 

-         Say N to delete power /proc/acpi/ folders that have moved to /sys/
+         Say N to delete power /proc/acpi/ directories that have moved to /sys/
+

 config ACPI_SYSFS_POWER
        bool "Future power /sys interface"
        select POWER_SUPPLY
        default y
        ---help---
          Say N to disable power /sys interface
 config ACPI_SYSFS_POWER
        bool "Future power /sys interface"
        select POWER_SUPPLY
        default y
        ---help---
          Say N to disable power /sys interface

+

 config ACPI_PROC_EVENT
        bool "Deprecated /proc/acpi/event support"
        depends on PROC_FS
 config ACPI_PROC_EVENT
        bool "Deprecated /proc/acpi/event support"
        depends on PROC_FS


@@ -138,6 +138,7 @@ config ACPI_VIDEO
        tristate "Video"
        depends on X86 && BACKLIGHT_CLASS_DEVICE && VIDEO_OUTPUT_CONTROL
        depends on INPUT
        tristate "Video"
        depends on X86 && BACKLIGHT_CLASS_DEVICE && VIDEO_OUTPUT_CONTROL
        depends on INPUT

+       select THERMAL

        help
          This driver implement the ACPI Extensions For Display Adapters
          for integrated graphics devices on motherboard, as specified in
        help
          This driver implement the ACPI Extensions For Display Adapters
          for integrated graphics devices on motherboard, as specified in


@@ -149,6 +150,7 @@ config ACPI_VIDEO
 
 config ACPI_FAN
        tristate "Fan"
 
 config ACPI_FAN
        tristate "Fan"

+       select THERMAL

        default y
        help
          This driver adds support for ACPI fan devices, allowing user-mode 
        default y
        help
          This driver adds support for ACPI fan devices, allowing user-mode 


@@ -170,6 +172,7 @@ config ACPI_BAY
 
 config ACPI_PROCESSOR
        tristate "Processor"
 
 config ACPI_PROCESSOR
        tristate "Processor"

+       select THERMAL

        default y
        help
          This driver installs ACPI as the idle handler for Linux, and uses
        default y
        help
          This driver installs ACPI as the idle handler for Linux, and uses


@@ -186,6 +189,7 @@ config ACPI_HOTPLUG_CPU
 config ACPI_THERMAL
        tristate "Thermal Zone"
        depends on ACPI_PROCESSOR
 config ACPI_THERMAL
        tristate "Thermal Zone"
        depends on ACPI_PROCESSOR

+       select THERMAL

        default y
        help
          This driver adds support for ACPI thermal zones.  Most mobile and
        default y
        help
          This driver adds support for ACPI thermal zones.  Most mobile and


@@ -199,6 +203,28 @@ config ACPI_NUMA
        depends on (X86 || IA64)
        default y if IA64_GENERIC || IA64_SGI_SN2
 
        depends on (X86 || IA64)
        default y if IA64_GENERIC || IA64_SGI_SN2
 

+config ACPI_WMI
+       tristate "WMI (EXPERIMENTAL)"
+       depends on X86
+       depends on EXPERIMENTAL
+       help
+         This driver adds support for the ACPI-WMI (Windows Management
+         Instrumentation) mapper device (PNP0C14) found on some systems.
+
+         ACPI-WMI is a proprietary extension to ACPI to expose parts of the
+         ACPI firmware to userspace - this is done through various vendor
+         defined methods and data blocks in a PNP0C14 device, which are then
+         made available for userspace to call.
+
+         The implementation of this in Linux currently only exposes this to
+         other kernel space drivers.
+
+         This driver is a required dependency to build the firmware specific
+         drivers needed on many machines, including Acer and HP laptops.
+
+         It is safe to enable this driver even if your DSDT doesn't define
+         any ACPI-WMI devices.
+

 config ACPI_ASUS
         tristate "ASUS/Medion Laptop Extras"
        depends on X86
 config ACPI_ASUS
         tristate "ASUS/Medion Laptop Extras"
        depends on X86


@@ -258,22 +284,23 @@ config ACPI_TOSHIBA
          If you have a legacy free Toshiba laptop (such as the Libretto L1
          series), say Y.
 
          If you have a legacy free Toshiba laptop (such as the Libretto L1
          series), say Y.
 

-config ACPI_CUSTOM_DSDT
-       bool "Include Custom DSDT"
-       depends on !STANDALONE
-       default n 
-       help
-         This option is to load a custom ACPI DSDT
-         If you don't know what that is, say N.
-

 config ACPI_CUSTOM_DSDT_FILE
        string "Custom DSDT Table file to include"
 config ACPI_CUSTOM_DSDT_FILE
        string "Custom DSDT Table file to include"

-       depends on ACPI_CUSTOM_DSDT

        default ""
        default ""

+       depends on !STANDALONE

        help
        help

+         This option supports a custom DSDT by linking it into the kernel.
+         See Documentation/acpi/dsdt-override.txt
+

          Enter the full path name to the file which includes the AmlCode
          declaration.
 
          Enter the full path name to the file which includes the AmlCode
          declaration.
 

+         If unsure, don't enter a file name.
+
+config ACPI_CUSTOM_DSDT
+       bool
+       default ACPI_CUSTOM_DSDT_FILE != ""
+

 config ACPI_BLACKLIST_YEAR
        int "Disable ACPI for systems before Jan 1st this year" if X86_32
        default 0
 config ACPI_BLACKLIST_YEAR
        int "Disable ACPI for systems before Jan 1st this year" if X86_32
        default 0