Commit b473406a authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-misc'

* acpi-misc:
  platform/x86: Fix unmet dependency warning for SAMSUNG_Q10
  platform/x86: Fix unmet dependency warning for ACPI_CMPC
parents 9baddb61 0ee4b5f8
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -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