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 501ed6ffa40fd4fcb70f88e4055067a599df0106..5d0e26a5c34cd55455ee776891acac0e861b93f6 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -43,54 +43,52 @@ menuconfig ACPI
 if ACPI
 
 config ACPI_SLEEP
 if ACPI
 
 config ACPI_SLEEP

-       bool "Sleep States"
-       depends on X86 && (!SMP || SUSPEND_SMP)
-       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_SLEEP_PROC_FS

        bool
        bool

-       depends on ACPI_SLEEP && PROC_FS
+       depends on PM_SLEEP

        default y
 
        default y
 

-config ACPI_SLEEP_PROC_SLEEP
-       bool "/proc/acpi/sleep (deprecated)"
-       depends on ACPI_SLEEP_PROC_FS
-       default n
-       ---help---
-         Create /proc/acpi/sleep
-         Deprecated by /sys/power/state
-

 config ACPI_PROCFS
 config ACPI_PROCFS

-       bool "Procfs interface (deprecated)"
+       bool "Deprecated /proc/acpi files"
+       depends on PROC_FS
+       ---help---
+         For backwards compatibility, this option allows
+         deprecated /proc/acpi/ files to exist, even when
+         they have been replaced by functions in /sys.
+         The deprecated files (and their replacements) include:
+
+         /proc/acpi/sleep (/sys/power/state)
+         /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/debug_layer (/sys/module/acpi/parameters/debug_layer)
+         /proc/acpi/debug_level (/sys/module/acpi/parameters/debug_level)
+
+         This option has no effect on /proc/acpi/ files
+         and functions which do not yet exist in /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---
        default y
        ---help---

-         The Procfs interface for ACPI is made optional for backward compatibility.
-         As the same functions are duplicated in the sysfs interface
-         and this proc interface will be removed some time later,
-         it's marked as deprecated.
-         ( /proc/acpi/debug_layer && debug_level are deprecated by
-           /sys/module/acpi/parameters/debug_layer && debug_level.
-           /proc/acpi/info is deprecated by
-           /sys/module/acpi/parameters/acpica_version )
+         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


@@ -99,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


@@ -118,7 +116,8 @@ config ACPI_BUTTON
 
 config ACPI_VIDEO
        tristate "Video"
 
 config ACPI_VIDEO
        tristate "Video"

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


@@ -351,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