diff --git a/[refs] b/[refs]
index 8558f1d3b332..9bbf6a734f72 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82732bdd663ee9dc1ad4b0409881fe89a9d827ca
+refs/heads/master: 7ea75801830082f68e4eb7f2e82283b9b2367461
diff --git a/trunk/drivers/base/regmap/Makefile b/trunk/drivers/base/regmap/Makefile
index 0573c8a9dacb..f331a90c47e2 100644
--- a/trunk/drivers/base/regmap/Makefile
+++ b/trunk/drivers/base/regmap/Makefile
@@ -1,4 +1,5 @@
-obj-$(CONFIG_REGMAP) += regmap.o regcache.o regcache-indexed.o regcache-rbtree.o regcache-lzo.o
+obj-$(CONFIG_REGMAP) += regmap.o regcache.o regcache-indexed.o
+obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-lzo.o
 obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o
 obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o
 obj-$(CONFIG_REGMAP_SPI) += regmap-spi.o