diff options
author | Dave Airlie | 2016-07-26 09:26:29 +0200 |
---|---|---|
committer | Dave Airlie | 2016-07-26 09:26:29 +0200 |
commit | 5e580523d9128a4d8364fe89d36c38fc7819c8dd (patch) | |
tree | 852fb2427d980830ae8686a91e4ca5873f259ab9 /sound/soc/codecs/ak4613.c | |
parent | Merge branch 'for-next' of http://git.agner.ch/git/linux-drm-fsl-dcu into drm... (diff) | |
parent | Linux 4.7 (diff) | |
download | kernel-qcow2-linux-5e580523d9128a4d8364fe89d36c38fc7819c8dd.tar.gz kernel-qcow2-linux-5e580523d9128a4d8364fe89d36c38fc7819c8dd.tar.xz kernel-qcow2-linux-5e580523d9128a4d8364fe89d36c38fc7819c8dd.zip |
Backmerge tag 'v4.7' into drm-next
Linux 4.7
As requested by Daniel Vetter as the conflicts were getting messy.
Diffstat (limited to 'sound/soc/codecs/ak4613.c')
-rw-r--r-- | sound/soc/codecs/ak4613.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/ak4613.c b/sound/soc/codecs/ak4613.c index 647f69de6baa..5013d2ba0c10 100644 --- a/sound/soc/codecs/ak4613.c +++ b/sound/soc/codecs/ak4613.c @@ -146,6 +146,7 @@ static const struct regmap_config ak4613_regmap_cfg = { .max_register = 0x16, .reg_defaults = ak4613_reg, .num_reg_defaults = ARRAY_SIZE(ak4613_reg), + .cache_type = REGCACHE_RBTREE, }; static const struct of_device_id ak4613_of_match[] = { @@ -530,7 +531,6 @@ static int ak4613_i2c_remove(struct i2c_client *client) static struct i2c_driver ak4613_i2c_driver = { .driver = { .name = "ak4613-codec", - .owner = THIS_MODULE, .of_match_table = ak4613_of_match, }, .probe = ak4613_i2c_probe, |