Merge branch 'topic/lzo' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

diff --cc drivers/base/regmap/Kconfig
index 413af5f,48b3fc1..073c0b7
--- 1/drivers/base/regmap/Kconfig
--- 2/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

diff --cc drivers/base/regmap/Makefile
Simple merge