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

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
...@@ -1419,7 +1419,7 @@ config MFD_TPS65217 ...@@ -1419,7 +1419,7 @@ config MFD_TPS65217
config MFD_TPS68470 config MFD_TPS68470
bool "TI TPS68470 Power Management / LED chips" bool "TI TPS68470 Power Management / LED chips"
depends on ACPI && I2C=y depends on ACPI && PCI && I2C=y
select MFD_CORE select MFD_CORE
select REGMAP_I2C select REGMAP_I2C
select I2C_DESIGNWARE_PLATFORM select I2C_DESIGNWARE_PLATFORM
......
...@@ -905,6 +905,7 @@ config TOSHIBA_WMI ...@@ -905,6 +905,7 @@ config TOSHIBA_WMI
config ACPI_CMPC config ACPI_CMPC
tristate "CMPC Laptop Extras" tristate "CMPC Laptop Extras"
depends on ACPI && INPUT depends on ACPI && INPUT
depends on BACKLIGHT_LCD_SUPPORT
depends on RFKILL || RFKILL=n depends on RFKILL || RFKILL=n
select BACKLIGHT_CLASS_DEVICE select BACKLIGHT_CLASS_DEVICE
help help
...@@ -1128,6 +1129,7 @@ config INTEL_OAKTRAIL ...@@ -1128,6 +1129,7 @@ config INTEL_OAKTRAIL
config SAMSUNG_Q10 config SAMSUNG_Q10
tristate "Samsung Q10 Extras" tristate "Samsung Q10 Extras"
depends on ACPI depends on ACPI
depends on BACKLIGHT_LCD_SUPPORT
select BACKLIGHT_CLASS_DEVICE select BACKLIGHT_CLASS_DEVICE
---help--- ---help---
This driver provides support for backlight control on Samsung Q10 This driver provides support for backlight control on Samsung Q10
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment