acpi: make ACPI_PROCFS default to y

[linux-2.6-omap-h63xx.git] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index efd47eeb5b631018a0238702c77ee2c0a16fce33..087a7028ae84ece99cd42676a585c43802fa573c 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -3,7 +3,7 @@
 #
 
 menuconfig ACPI
 #
 
 menuconfig ACPI

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

        depends on !X86_NUMAQ
        depends on !X86_VISWS
        depends on !IA64_HP_SIM
        depends on !X86_NUMAQ
        depends on !X86_VISWS
        depends on !IA64_HP_SIM


@@ -43,31 +43,17 @@ menuconfig ACPI
 if ACPI
 
 config ACPI_SLEEP
 if ACPI
 
 config ACPI_SLEEP

-       bool "Sleep States"
-       depends on X86 && (!SMP || SUSPEND_SMP)
+       bool
+       depends on PM_SLEEP

        default y
        default y

-       ---help---
-         This option adds support for ACPI suspend states. 
-
-         With this option, you will be able to put the system "to sleep". 
-         Sleep states are low power states for the system and devices. All
-         of the system operating state is saved to either memory or disk
-         (depending on the state), to allow the system to resume operation
-         quickly at your request.
-
-         Although this option sounds really nifty, barely any of the device
-         drivers have been converted to the new driver model and hence few
-         have proper power management support. 
-
-         This option is not recommended for anyone except those doing driver
-         power management development.

 
 config ACPI_PROCFS
        bool "Deprecated /proc/acpi files"
        depends on PROC_FS
 
 config ACPI_PROCFS
        bool "Deprecated /proc/acpi files"
        depends on PROC_FS

+       default y

        ---help---
          For backwards compatibility, this option allows
        ---help---
          For backwards compatibility, this option allows

-         depricated /proc/acpi/ files to exist, even when
+         deprecated /proc/acpi/ files to exist, even when

          they have been replaced by functions in /sys.
          The deprecated files (and their replacements) include:
 
          they have been replaced by functions in /sys.
          The deprecated files (and their replacements) include:
 


@@ -75,6 +61,7 @@ config ACPI_PROCFS
          /proc/acpi/info (/sys/modules/acpi/parameters/acpica_version)
          /proc/acpi/dsdt (/sys/firmware/acpi/tables/DSDT)
          /proc/acpi/fadt (/sys/firmware/acpi/tables/FACP)
          /proc/acpi/info (/sys/modules/acpi/parameters/acpica_version)
          /proc/acpi/dsdt (/sys/firmware/acpi/tables/DSDT)
          /proc/acpi/fadt (/sys/firmware/acpi/tables/FACP)

+         /proc/acpi/battery (/sys/class/power_supply)

          /proc/acpi/debug_layer (/sys/module/acpi/parameters/debug_layer)
          /proc/acpi/debug_level (/sys/module/acpi/parameters/debug_level)
 
          /proc/acpi/debug_layer (/sys/module/acpi/parameters/debug_layer)
          /proc/acpi/debug_level (/sys/module/acpi/parameters/debug_level)
 


@@ -83,9 +70,28 @@ config ACPI_PROCFS
 
          Say N to delete /proc/acpi/ files that have moved to /sys/
 
 
          Say N to delete /proc/acpi/ files that have moved to /sys/
 

+config ACPI_PROC_EVENT
+       bool "Deprecated /proc/acpi/event support"
+       depends on PROC_FS
+       default y
+       ---help---
+         A user-space daemon, acpi, typically read /proc/acpi/event
+         and handled all ACPI sub-system generated events.
+
+         These events are now delivered to user-space via
+         either the input layer, or as netlink events.
+
+         This build option enables the old code for legacy
+         user-space implementation.  After some time, this will
+         be moved under CONFIG_ACPI_PROCFS, and then deleted.
+
+         Say Y here to retain the old behaviour.  Say N if your
+         user-space is newer than kernel 2.6.23 (September 2007).
+

 config ACPI_AC
        tristate "AC Adapter"
        depends on X86
 config ACPI_AC
        tristate "AC Adapter"
        depends on X86

+       select POWER_SUPPLY

        default y
        help
          This driver adds support for the AC Adapter object, which indicates
        default y
        help
          This driver adds support for the AC Adapter object, which indicates


@@ -95,6 +101,7 @@ config ACPI_AC
 config ACPI_BATTERY
        tristate "Battery"
        depends on X86
 config ACPI_BATTERY
        tristate "Battery"
        depends on X86

+       select POWER_SUPPLY

        default y
        help
          This driver adds support for battery information through
        default y
        help
          This driver adds support for battery information through


@@ -114,6 +121,7 @@ config ACPI_BUTTON
 config ACPI_VIDEO
        tristate "Video"
        depends on X86 && BACKLIGHT_CLASS_DEVICE && VIDEO_OUTPUT_CONTROL
 config ACPI_VIDEO
        tristate "Video"
        depends on X86 && BACKLIGHT_CLASS_DEVICE && VIDEO_OUTPUT_CONTROL

+       depends on INPUT

        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


@@ -346,12 +354,11 @@ config ACPI_HOTPLUG_MEMORY
                $>modprobe acpi_memhotplug 
 
 config ACPI_SBS
                $>modprobe acpi_memhotplug 
 
 config ACPI_SBS

-       tristate "Smart Battery System (EXPERIMENTAL)"
+       tristate "Smart Battery System"

        depends on X86
        depends on X86

-       depends on EXPERIMENTAL
+       select POWER_SUPPLY

        help
        help

-         This driver adds support for the Smart Battery System.
-         A "Smart Battery" is quite old and quite rare compared
-         to today's ACPI "Control Method" battery.
+         This driver adds support for the Smart Battery System, another
+         type of access to battery information, found on some laptops.

 
 endif  # ACPI
 
 endif  # ACPI