From: Mark Brown <broonie@kernel.org>
Date: Fri, 24 Jul 2015 15:11:47 +0000 (+0100)
Subject: Merge branch 'topic/owner' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: next-20150824~60^2~18^2~2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=beb8962210f592bd285ed77559ac4458cc26f774;p=uclinux-h8%2Flinux.git

Merge branch 'topic/owner' of git://git./linux/kernel/git/broonie/sound into asoc-ssm4567

Conflicts:
	sound/soc/codecs/ssm4567.c
---

beb8962210f592bd285ed77559ac4458cc26f774
diff --cc sound/soc/codecs/ssm4567.c
index af536ae75df9,f3f1f6874c72..7a12ac5a24a6
--- a/sound/soc/codecs/ssm4567.c
+++ b/sound/soc/codecs/ssm4567.c
@@@ -464,8 -453,6 +464,7 @@@ MODULE_DEVICE_TABLE(acpi, ssm4567_acpi_
  static struct i2c_driver ssm4567_driver = {
  	.driver = {
  		.name = "ssm4567",
- 		.owner = THIS_MODULE,
 +		.acpi_match_table = ACPI_PTR(ssm4567_acpi_match),
  	},
  	.probe = ssm4567_i2c_probe,
  	.remove = ssm4567_i2c_remove,