summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-02-01 11:06:05 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-02-01 11:06:05 +0100
commitb473406a06c49d39d6d653e9981b0bd70300485d (patch)
tree1c2b4bfbc60b46c7779aa7e4f221a373b696abd8 /drivers
parent9baddb61dfec0215da5d10a1d173790443e276c2 (diff)
parent0ee4b5f801b73b83a9fb3921d725f2162fd4a2e5 (diff)
downloadlwn-b473406a06c49d39d6d653e9981b0bd70300485d.tar.gz
lwn-b473406a06c49d39d6d653e9981b0bd70300485d.zip
Merge branch 'acpi-misc'
* acpi-misc: platform/x86: Fix unmet dependency warning for SAMSUNG_Q10 platform/x86: Fix unmet dependency warning for ACPI_CMPC
Diffstat (limited to 'drivers')
-rw-r--r--drivers/platform/x86/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 5e2109c54c7c..b5e9db85e881 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -905,6 +905,7 @@ config TOSHIBA_WMI
config ACPI_CMPC
tristate "CMPC Laptop Extras"
depends on ACPI && INPUT
+ depends on BACKLIGHT_LCD_SUPPORT
depends on RFKILL || RFKILL=n
select BACKLIGHT_CLASS_DEVICE
help
@@ -1128,6 +1129,7 @@ config INTEL_OAKTRAIL
config SAMSUNG_Q10
tristate "Samsung Q10 Extras"
depends on ACPI
+ depends on BACKLIGHT_LCD_SUPPORT
select BACKLIGHT_CLASS_DEVICE
---help---
This driver provides support for backlight control on Samsung Q10