Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[linux-2.6-microblaze.git] / drivers / mfd / wm97xx-core.c

diff --git a/drivers/mfd/wm97xx-core.c b/drivers/mfd/wm97xx-core.c
index 663acbb..1566a9b 100644 (file)
--- a/drivers/mfd/wm97xx-core.c
+++ b/drivers/mfd/wm97xx-core.c
@@ -95,7 +95,7 @@ static const struct regmap_config wm9705_regmap_config = {
        .reg_stride = 2,
        .val_bits = 16,
        .max_register = 0x7e,
-       .cache_type = REGCACHE_RBTREE,
+       .cache_type = REGCACHE_MAPLE,
 
        .reg_defaults = wm9705_reg_defaults,
        .num_reg_defaults = ARRAY_SIZE(wm9705_reg_defaults),
@@ -163,7 +163,7 @@ static const struct regmap_config wm9712_regmap_config = {
        .reg_stride = 2,
        .val_bits = 16,
        .max_register = 0x7e,
-       .cache_type = REGCACHE_RBTREE,
+       .cache_type = REGCACHE_MAPLE,
 
        .reg_defaults = wm9712_reg_defaults,
        .num_reg_defaults = ARRAY_SIZE(wm9712_reg_defaults),
@@ -234,7 +234,7 @@ static const struct regmap_config wm9713_regmap_config = {
        .reg_stride = 2,
        .val_bits = 16,
        .max_register = 0x7e,
-       .cache_type = REGCACHE_RBTREE,
+       .cache_type = REGCACHE_MAPLE,
 
        .reg_defaults = wm9713_reg_defaults,
        .num_reg_defaults = ARRAY_SIZE(wm9713_reg_defaults),