Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-2.6-microblaze.git] / drivers / platform / x86 / Kconfig

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 5ae65c1..27df2c5 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -27,8 +27,6 @@ config ACER_WMI
        depends on ACPI_WMI
        select INPUT_SPARSEKMAP
        # Acer WMI depends on ACPI_VIDEO when ACPI is enabled
-       # but for select to work, need to select ACPI_VIDEO's dependencies, ick
-        select VIDEO_OUTPUT_CONTROL if ACPI
         select ACPI_VIDEO if ACPI
        ---help---
          This is a driver for newer Acer (and Wistron) laptops. It adds
@@ -55,6 +53,18 @@ config ACERHDF
          If you have an Acer Aspire One netbook, say Y or M
          here.
 
+config ALIENWARE_WMI
+       tristate "Alienware Special feature control"
+       depends on ACPI
+       depends on LEDS_CLASS
+       depends on NEW_LEDS
+       depends on ACPI_WMI
+       ---help---
+        This is a driver for controlling Alienware BIOS driven
+        features.  It exposes an interface for controlling the AlienFX
+        zones on Alienware machines that don't contain a dedicated AlienFX
+        USB MCU such as the X51 and X51-R2.
+
 config ASUS_LAPTOP
        tristate "Asus Laptop Extras"
        depends on ACPI
@@ -198,7 +208,7 @@ config HP_ACCEL
          be called hp_accel.
 
 config HP_WIRELESS
-       tristate "HP WIRELESS"
+       tristate "HP wireless button"
        depends on ACPI
        depends on INPUT
        help
@@ -819,12 +829,4 @@ config PVPANIC
          a paravirtualized device provided by QEMU; it lets a virtual machine
          (guest) communicate panic events to the host.
 
-config INTEL_BAYTRAIL_MBI
-       tristate
-       depends on PCI
-       ---help---
-         Needed on Baytrail platforms for access to the IOSF Sideband Mailbox
-         Interface. This is a requirement for systems that need to configure
-         the PUNIT for power management features such as RAPL.
-
 endif # X86_PLATFORM_DEVICES