diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-14 17:11:07 +0000 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-14 17:11:07 +0000 |
commit | 7798b582d31e92227ca457f93db320ad9654dada (patch) | |
tree | 13ea398eb239df155bba350bdb0ba4db18df5dc3 /drivers/base/regmap/Makefile | |
parent | 43280026c842c44a8505a1b909378e62f754ecfe (diff) | |
parent | 2ac902ce17f9dfa0d4d1f0818be147b5d2515fb7 (diff) | |
download | op-kernel-dev-7798b582d31e92227ca457f93db320ad9654dada.zip op-kernel-dev-7798b582d31e92227ca457f93db320ad9654dada.tar.gz |
Merge remote-tracking branch 'regmap/topic/flat' into regmap-next
Diffstat (limited to 'drivers/base/regmap/Makefile')
-rw-r--r-- | drivers/base/regmap/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/regmap/Makefile b/drivers/base/regmap/Makefile index 5e75d1b..cf12998 100644 --- a/drivers/base/regmap/Makefile +++ b/drivers/base/regmap/Makefile @@ -1,5 +1,5 @@ obj-$(CONFIG_REGMAP) += regmap.o regcache.o -obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-lzo.o +obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-lzo.o regcache-flat.o obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o obj-$(CONFIG_REGMAP_SPI) += regmap-spi.o |