Merge tag 'platform-drivers-x86-v4.2-2' of git://git.infradead.org/users/dvhart/linux...

[uclinux-h8/linux.git] / drivers / platform / x86 / Kconfig

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index b92f592..6dc13e4 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -71,9 +71,10 @@ config ASUS_LAPTOP
        depends on ACPI
        select LEDS_CLASS
        select NEW_LEDS
-       select BACKLIGHT_CLASS_DEVICE
+       depends on BACKLIGHT_CLASS_DEVICE
        depends on INPUT
        depends on RFKILL || RFKILL = n
+       depends on ACPI_VIDEO || ACPI_VIDEO = n
        select INPUT_SPARSEKMAP
        select INPUT_POLLDEV
        ---help---
@@ -95,6 +96,7 @@ config DELL_LAPTOP
        depends on X86
        depends on DCDBAS
        depends on BACKLIGHT_CLASS_DEVICE
+       depends on ACPI_VIDEO || ACPI_VIDEO = n
        depends on RFKILL || RFKILL = n
        depends on SERIO_I8042
        select POWER_SUPPLY
@@ -109,6 +111,7 @@ config DELL_WMI
        tristate "Dell WMI extras"
        depends on ACPI_WMI
        depends on INPUT
+       depends on ACPI_VIDEO || ACPI_VIDEO = n
        select INPUT_SPARSEKMAP
        ---help---
          Say Y here if you want to support WMI-based hotkeys on Dell laptops.
@@ -160,6 +163,7 @@ config FUJITSU_LAPTOP
        depends on ACPI
        depends on INPUT
        depends on BACKLIGHT_CLASS_DEVICE
+       depends on ACPI_VIDEO || ACPI_VIDEO = n
        depends on LEDS_CLASS || LEDS_CLASS=n
        ---help---
          This is a driver for laptops built by Fujitsu:
@@ -263,6 +267,7 @@ config MSI_LAPTOP
        tristate "MSI Laptop Extras"
        depends on ACPI
        depends on BACKLIGHT_CLASS_DEVICE
+       depends on ACPI_VIDEO || ACPI_VIDEO = n
        depends on RFKILL
        depends on INPUT && SERIO_I8042
        select INPUT_SPARSEKMAP
@@ -296,6 +301,7 @@ config COMPAL_LAPTOP
        tristate "Compal (and others) Laptop Extras"
        depends on ACPI
        depends on BACKLIGHT_CLASS_DEVICE
+       depends on ACPI_VIDEO || ACPI_VIDEO = n
        depends on RFKILL
        depends on HWMON
        depends on POWER_SUPPLY
@@ -312,7 +318,8 @@ config COMPAL_LAPTOP
 config SONY_LAPTOP
        tristate "Sony Laptop Extras"
        depends on ACPI
-       select BACKLIGHT_CLASS_DEVICE
+       depends on ACPI_VIDEO || ACPI_VIDEO = n
+       depends on BACKLIGHT_CLASS_DEVICE
        depends on INPUT
        depends on RFKILL
          ---help---
@@ -337,6 +344,7 @@ config IDEAPAD_LAPTOP
        depends on RFKILL && INPUT
        depends on SERIO_I8042
        depends on BACKLIGHT_CLASS_DEVICE
+       depends on ACPI_VIDEO || ACPI_VIDEO = n
        select INPUT_SPARSEKMAP
        help
          This is a driver for Lenovo IdeaPad netbooks contains drivers for
@@ -347,8 +355,8 @@ config THINKPAD_ACPI
        depends on ACPI
        depends on INPUT
        depends on RFKILL || RFKILL = n
-       select BACKLIGHT_LCD_SUPPORT
-       select BACKLIGHT_CLASS_DEVICE
+       depends on ACPI_VIDEO || ACPI_VIDEO = n
+       depends on BACKLIGHT_CLASS_DEVICE
        select HWMON
        select NVRAM
        select NEW_LEDS
@@ -516,8 +524,9 @@ config EEEPC_LAPTOP
        depends on ACPI
        depends on INPUT
        depends on RFKILL || RFKILL = n
+       depends on ACPI_VIDEO || ACPI_VIDEO = n
        depends on HOTPLUG_PCI
-       select BACKLIGHT_CLASS_DEVICE
+       depends on BACKLIGHT_CLASS_DEVICE
        select HWMON
        select LEDS_CLASS
        select NEW_LEDS
@@ -603,6 +612,7 @@ config MSI_WMI
        depends on ACPI_WMI
        depends on INPUT
        depends on BACKLIGHT_CLASS_DEVICE
+       depends on ACPI_VIDEO || ACPI_VIDEO = n
        select INPUT_SPARSEKMAP
        help
         Say Y here if you want to support WMI-based hotkeys on MSI laptops.
@@ -676,7 +686,7 @@ config TOSHIBA_HAPS
        depends on ACPI
        ---help---
          This driver adds support for the built-in accelerometer
-         found on recent Toshiba laptops equiped with HID TOS620A
+         found on recent Toshiba laptops equipped with HID TOS620A
          device.
 
          This driver receives ACPI notify events 0x80 when the sensor
@@ -685,7 +695,7 @@ config TOSHIBA_HAPS
          been stabilized.
 
          Also provides sysfs entries to get/set the desired protection
-         level and reseting the HDD protection interface.
+         level and resetting the HDD protection interface.
 
          If you have a recent Toshiba laptop with a built-in accelerometer
          device, say Y.
@@ -840,6 +850,7 @@ config MXM_WMI
 config INTEL_OAKTRAIL
        tristate "Intel Oaktrail Platform Extras"
        depends on ACPI
+       depends on ACPI_VIDEO || ACPI_VIDEO = n
        depends on RFKILL && BACKLIGHT_CLASS_DEVICE && ACPI
        ---help---
          Intel Oaktrail platform need this driver to provide interfaces to