From: Mark Brown <broonie@kernel.org>
Date: Tue, 6 Jun 2017 19:10:47 +0000 (+0100)
Subject: Merge branch 'topic/lzo' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: v4.13-rc1~177^2^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=c13be1d942c1e9c2250370f4dfc46031ade0802a;p=linux.git

Merge branch 'topic/lzo' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into regmap-1wire
---

c13be1d942c1e9c2250370f4dfc46031ade0802a
diff --cc drivers/base/regmap/Kconfig
index 413af5f94058,48b3fc1ee514..073c0b77e5b3
--- a/drivers/base/regmap/Kconfig
+++ b/drivers/base/regmap/Kconfig
@@@ -3,10 -3,13 +3,13 @@@
  # subsystems should select the appropriate symbols.
  
  config REGMAP
 -	default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_SPMI || REGMAP_AC97 || REGMAP_MMIO || REGMAP_IRQ)
 +	default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_SPMI || REGMAP_W1 || REGMAP_AC97 || REGMAP_MMIO || REGMAP_IRQ)
+ 	select IRQ_DOMAIN if REGMAP_IRQ
+ 	bool
+ 
+ config REGCACHE_COMPRESSED
  	select LZO_COMPRESS
  	select LZO_DECOMPRESS
- 	select IRQ_DOMAIN if REGMAP_IRQ
  	bool
  
  config REGMAP_AC97