summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-23 13:11:07 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-23 13:11:07 -0700
commiteb2689e06b3526c7684b09beecf26070f05ee825 (patch)
treecf55297c4c960eb07c815620c65628201138c839 /drivers/base
parent2e341ca686042aa464efa755447e7bcee91d1eb6 (diff)
parent18d5eacb52291faaa430fc50b435b3bb204dba88 (diff)
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
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/regmap/Kconfig1
1 files changed, 1 insertions, 0 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