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/ssm4567.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/ssm4567.c')
| -rw-r--r-- | sound/soc/codecs/ssm4567.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/codecs/ssm4567.c b/sound/soc/codecs/ssm4567.c index af536ae75df9..7a12ac5a24a6 100644 --- a/sound/soc/codecs/ssm4567.c +++ b/sound/soc/codecs/ssm4567.c @@ -464,7 +464,6 @@ MODULE_DEVICE_TABLE(acpi, ssm4567_acpi_match); static struct i2c_driver ssm4567_driver = { .driver = { .name = "ssm4567", - .owner = THIS_MODULE, .acpi_match_table = ACPI_PTR(ssm4567_acpi_match), }, .probe = ssm4567_i2c_probe, |