diff options
author | Mark Brown <broonie@kernel.org> | 2015-07-24 17:11:47 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-07-24 17:11:47 +0200 |
commit | beb8962210f592bd285ed77559ac4458cc26f774 (patch) | |
tree | f36bba55c0582758f89ac05dccff197b1bbd4d32 /sound/soc/codecs/adau1977-i2c.c | |
parent | ASoC: ssm4567: Added ACPI entry for SSM4567 codec (diff) | |
parent | ASoC: drivers: Drop owner assignment from i2c_driver (diff) | |
download | linux-beb8962210f592bd285ed77559ac4458cc26f774.tar.xz linux-beb8962210f592bd285ed77559ac4458cc26f774.zip |
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/adau1977-i2c.c')
-rw-r--r-- | sound/soc/codecs/adau1977-i2c.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/codecs/adau1977-i2c.c b/sound/soc/codecs/adau1977-i2c.c index 9700e8c838c9..21e7394a972a 100644 --- a/sound/soc/codecs/adau1977-i2c.c +++ b/sound/soc/codecs/adau1977-i2c.c @@ -46,7 +46,6 @@ MODULE_DEVICE_TABLE(i2c, adau1977_i2c_ids); static struct i2c_driver adau1977_i2c_driver = { .driver = { .name = "adau1977", - .owner = THIS_MODULE, }, .probe = adau1977_i2c_probe, .remove = adau1977_i2c_remove, |