diff --git a/[refs] b/[refs]
index 43c9dbc2c0ae..eff77d86d286 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ae0d7e8a918e9603748abe9b31984fc5d96abb3
+refs/heads/master: 50b776fc71c13663eb7434f634f2b796de5c9885
diff --git a/trunk/drivers/base/regmap/regcache-lzo.c b/trunk/drivers/base/regmap/regcache-lzo.c
index 066aeece3626..854448d09293 100644
--- a/trunk/drivers/base/regmap/regcache-lzo.c
+++ b/trunk/drivers/base/regmap/regcache-lzo.c
@@ -351,7 +351,7 @@ static int regcache_lzo_sync(struct regmap *map)
 }
 
 struct regcache_ops regcache_lzo_ops = {
-	.type = REGCACHE_LZO,
+	.type = REGCACHE_COMPRESSED,
 	.name = "lzo",
 	.init = regcache_lzo_init,
 	.exit = regcache_lzo_exit,
diff --git a/trunk/include/linux/regmap.h b/trunk/include/linux/regmap.h
index 32043a9749e6..bebda1481f23 100644
--- a/trunk/include/linux/regmap.h
+++ b/trunk/include/linux/regmap.h
@@ -25,7 +25,7 @@ enum regcache_type {
 	REGCACHE_NONE,
 	REGCACHE_INDEXED,
 	REGCACHE_RBTREE,
-	REGCACHE_LZO
+	REGCACHE_COMPRESSED
 };
 
 /**