Commit eb2689e0 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'regmap-domain-deps' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap

Pull a regmap kconfig dependency fix from Mark Brown:
 "Fix the dependency on IRQ_DOMAIN for REGMAP_IRQ in the core

  Fixes a missing select from the Palmas driver a bit more throoughly."

* tag 'regmap-domain-deps' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: Use select .. if to get IRQ_DOMAIN enabled
parents 2e341ca6 18d5eacb
...@@ -6,6 +6,7 @@ config REGMAP ...@@ -6,6 +6,7 @@ config REGMAP
default y if (REGMAP_I2C || REGMAP_SPI) default y if (REGMAP_I2C || REGMAP_SPI)
select LZO_COMPRESS select LZO_COMPRESS
select LZO_DECOMPRESS select LZO_DECOMPRESS
select IRQ_DOMAIN if REGMAP_IRQ
bool bool
config REGMAP_I2C config REGMAP_I2C
......
...@@ -377,7 +377,6 @@ config PMIC_DA9052 ...@@ -377,7 +377,6 @@ config PMIC_DA9052
config MFD_DA9052_SPI config MFD_DA9052_SPI
bool "Support Dialog Semiconductor DA9052/53 PMIC variants with SPI" bool "Support Dialog Semiconductor DA9052/53 PMIC variants with SPI"
select IRQ_DOMAIN
select REGMAP_SPI select REGMAP_SPI
select REGMAP_IRQ select REGMAP_IRQ
select PMIC_DA9052 select PMIC_DA9052
...@@ -390,7 +389,6 @@ config MFD_DA9052_SPI ...@@ -390,7 +389,6 @@ config MFD_DA9052_SPI
config MFD_DA9052_I2C config MFD_DA9052_I2C
bool "Support Dialog Semiconductor DA9052/53 PMIC variants with I2C" bool "Support Dialog Semiconductor DA9052/53 PMIC variants with I2C"
select IRQ_DOMAIN
select REGMAP_I2C select REGMAP_I2C
select REGMAP_IRQ select REGMAP_IRQ
select PMIC_DA9052 select PMIC_DA9052
...@@ -561,7 +559,6 @@ config MFD_WM8994 ...@@ -561,7 +559,6 @@ config MFD_WM8994
bool "Support Wolfson Microelectronics WM8994" bool "Support Wolfson Microelectronics WM8994"
select MFD_CORE select MFD_CORE
select REGMAP_I2C select REGMAP_I2C
select IRQ_DOMAIN
select REGMAP_IRQ select REGMAP_IRQ
depends on I2C=y && GENERIC_HARDIRQS depends on I2C=y && GENERIC_HARDIRQS
help help
......
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