Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4771eec1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-5.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI Kconfig fixes from Rafael Wysocki:
 "Prevent invalid configurations from being created (e.g. by randconfig)
  due to some ACPI-related Kconfig options' dependencies that are not
  specified directly (Sinan Kaya)"

* tag 'acpi-5.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  platform/x86: Fix unmet dependency warning for SAMSUNG_Q10
  platform/x86: Fix unmet dependency warning for ACPI_CMPC
  mfd: Fix unmet dependency warning for MFD_TPS68470
parents cca2e06a b473406a

drivers/mfd/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1419,7 +1419,7 @@ config MFD_TPS65217 


config MFD_TPS68470

	bool "TI TPS68470 Power Management / LED chips"

	depends on ACPI && I2C=y

	depends on ACPI && PCI && I2C=y

	select MFD_CORE

	select REGMAP_I2C

	select I2C_DESIGNWARE_PLATFORM

drivers/platform/x86/Kconfig

+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