Staging: staging/cxt1e1: Convert bare printks to pr_<level>

[safe/jmp/linux-2.6] / drivers / platform / x86 / Kconfig

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 527abf1..6c3320d 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -81,6 +81,7 @@ config DELL_LAPTOP
        depends on BACKLIGHT_CLASS_DEVICE
        depends on RFKILL || RFKILL = n
        depends on POWER_SUPPLY
+       depends on SERIO_I8042
        default n
        ---help---
        This driver adds support for rfkill and backlight control to Dell
@@ -149,6 +150,7 @@ config MSI_LAPTOP
        tristate "MSI Laptop Extras"
        depends on ACPI
        depends on BACKLIGHT_CLASS_DEVICE
+       depends on RFKILL
        ---help---
          This is a driver for laptops built by MSI (MICRO-STAR
          INTERNATIONAL):
@@ -178,6 +180,7 @@ config COMPAL_LAPTOP
        tristate "Compal Laptop Extras"
        depends on ACPI
        depends on BACKLIGHT_CLASS_DEVICE
+       depends on RFKILL
        ---help---
          This is a driver for laptops built by Compal:
 
@@ -321,9 +324,15 @@ config THINKPAD_ACPI_VIDEO
          server running, phase of the moon, and the current mood of
          Schroedinger's cat.  If you can use X.org's RandR to control
          your ThinkPad's video output ports instead of this feature,
-         don't think twice: do it and say N here to save some memory.
+         don't think twice: do it and say N here to save memory and avoid
+         bad interactions with X.org.
 
-         If you are not sure, say Y here.
+         NOTE: access to this feature is limited to processes with the
+         CAP_SYS_ADMIN capability, to avoid local DoS issues in platforms
+         where it interacts badly with X.org.
+
+         If you are not sure, say Y here but do try to check if you could
+         be using X.org RandR instead.
 
 config THINKPAD_ACPI_HOTKEY_POLL
        bool "Support NVRAM polling for hot keys"
@@ -376,6 +385,17 @@ config EEEPC_LAPTOP
 
          If you have an Eee PC laptop, say Y or M here.
 
+config EEEPC_WMI
+       tristate "Eee PC WMI Hotkey Driver (EXPERIMENTAL)"
+       depends on ACPI_WMI
+       depends on INPUT
+       depends on EXPERIMENTAL
+       select INPUT_SPARSEKMAP
+       ---help---
+         Say Y here if you want to support WMI-based hotkeys on Eee PC laptops.
+
+         To compile this driver as a module, choose M here: the module will
+         be called eeepc-wmi.
 
 config ACPI_WMI
        tristate "WMI"