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

2 files changed, 1 insertions, 3 deletions

diff --git a/drivers/base/regmap/Kconfig b/drivers/base/regmap/Kconfig
index 9ef0a5326f17..6be390bd8bd1 100644
--- a/drivers/base/regmap/Kconfig
+++ b/drivers/base/regmap/Kconfig
@@ -6,6 +6,7 @@ config REGMAP
         default y if (REGMAP_I2C || REGMAP_SPI)
         select LZO_COMPRESS
         select LZO_DECOMPRESS
+        select IRQ_DOMAIN if REGMAP_IRQ
         bool
 
 config REGMAP_I2C
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 220686159c15..f4b4dad77391 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -377,7 +377,6 @@ config PMIC_DA9052
 
 config MFD_DA9052_SPI
         bool "Support Dialog Semiconductor DA9052/53 PMIC variants with SPI"
-        select IRQ_DOMAIN
         select REGMAP_SPI
         select REGMAP_IRQ
         select PMIC_DA9052
@@ -390,7 +389,6 @@ config MFD_DA9052_SPI
 
 config MFD_DA9052_I2C
         bool "Support Dialog Semiconductor DA9052/53 PMIC variants with I2C"
-        select IRQ_DOMAIN
         select REGMAP_I2C
         select REGMAP_IRQ
         select PMIC_DA9052
@@ -561,7 +559,6 @@ config MFD_WM8994
         bool "Support Wolfson Microelectronics WM8994"
         select MFD_CORE
         select REGMAP_I2C
-        select IRQ_DOMAIN
         select REGMAP_IRQ
         depends on I2C=y && GENERIC_HARDIRQS
         help