memory hotplug: rearrange memory hotplug notifier

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

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index f1372de4ce7904d06577df91f24a5be725bb852e..5d0e26a5c34cd55455ee776891acac0e861b93f6 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -52,7 +52,7 @@ config ACPI_PROCFS
        depends on PROC_FS
        ---help---
          For backwards compatibility, this option allows
        depends on PROC_FS
        ---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:
 


@@ -68,9 +68,27 @@ 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"
 config ACPI_AC
        tristate "AC Adapter"

-       depends on X86
+       depends on X86 && 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


@@ -79,7 +97,7 @@ config ACPI_AC
 
 config ACPI_BATTERY
        tristate "Battery"
 
 config ACPI_BATTERY
        tristate "Battery"

-       depends on X86
+       depends on X86 && POWER_SUPPLY

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


@@ -99,6 +117,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


@@ -331,12 +350,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
+       depends on 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