[PATCH] ext4: 48bit i_file_acl

[powerpc.git] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 89eacd1..0f9d4be 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -132,6 +132,12 @@ config ACPI_FAN
          This driver adds support for ACPI fan devices, allowing user-mode 
          applications to perform basic fan control (on, off, status).
 
+config ACPI_DOCK
+       tristate "Dock"
+       depends on EXPERIMENTAL
+       help
+         This driver adds support for ACPI controlled docking stations
+
 config ACPI_PROCESSOR
        tristate "Processor"
        default y
@@ -206,6 +212,7 @@ config ACPI_IBM
 config ACPI_IBM_DOCK
        bool "Legacy Docking Station Support"
        depends on ACPI_IBM
+       depends on ACPI_DOCK=n
        default n
        ---help---
          Allows the ibm_acpi driver to handle docking station events.
@@ -246,7 +253,7 @@ config ACPI_CUSTOM_DSDT
        depends on !STANDALONE
        default n 
        help
-         Thist option is to load a custom ACPI DSDT
+         This option is to load a custom ACPI DSDT
          If you don't know what that is, say N.
 
 config ACPI_CUSTOM_DSDT_FILE
@@ -303,7 +310,7 @@ config X86_PM_TIMER
          The Power Management Timer is available on all ACPI-capable,
          in most cases even if ACPI is unusable or blacklisted.
 
-         This timing source is not affected by powermanagement features
+         This timing source is not affected by power management features
          like aggressive processor idling, throttling, frequency and/or
          voltage scaling, unlike the commonly used Time Stamp Counter
          (TSC) timing source.
@@ -338,7 +345,7 @@ config ACPI_HOTPLUG_MEMORY
          Enabling this driver assumes that your platform hardware
          and firmware have support for hot-plugging physical memory. If
          your system does not support physically adding or ripping out 
-         memory DIMMs at some platfrom defined granularity (individually 
+         memory DIMMs at some platform defined granularity (individually 
          or as a bank) at runtime, then you need not enable this driver.
 
          If one selects "m," this driver can be loaded using the following