diff options
author | Mark Brown <broonie@kernel.org> | 2015-07-24 16:11:47 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-07-24 16:11:47 +0100 |
commit | beb8962210f592bd285ed77559ac4458cc26f774 (patch) | |
tree | f36bba55c0582758f89ac05dccff197b1bbd4d32 /sound/soc/codecs/cs4270.c | |
parent | eeffd4b442eb2aa25257d8c6631b17cba685ccac (diff) | |
parent | 1c07a4de5baad76585f7ffb86b5b0bc34c33e8a6 (diff) | |
download | linux-beb8962210f592bd285ed77559ac4458cc26f774.tar.bz2 |
Merge branch 'topic/owner' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-ssm4567
Conflicts:
sound/soc/codecs/ssm4567.c
Diffstat (limited to 'sound/soc/codecs/cs4270.c')
-rw-r--r-- | sound/soc/codecs/cs4270.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c index e6d4ff9fd992..e07807d96b68 100644 --- a/sound/soc/codecs/cs4270.c +++ b/sound/soc/codecs/cs4270.c @@ -751,7 +751,6 @@ MODULE_DEVICE_TABLE(i2c, cs4270_id); static struct i2c_driver cs4270_i2c_driver = { .driver = { .name = "cs4270", - .owner = THIS_MODULE, .of_match_table = cs4270_of_match, }, .id_table = cs4270_id, |