From: Mark Brown <broonie@kernel.org>
Date: Sun, 30 Aug 2015 14:54:57 +0000 (+0100)
Subject: Merge remote-tracking branches 'asoc/topic/max98090', 'asoc/topic/max98095', 'asoc... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1d1ed2c23e6fac1c9a11df846536553754ac9780;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge remote-tracking branches 'asoc/topic/max98090', 'asoc/topic/max98095', 'asoc/topic/max98357a', 'asoc/topic/max9877' and 'asoc/topic/max98925' into asoc-next
---

1d1ed2c23e6fac1c9a11df846536553754ac9780
diff --cc sound/soc/codecs/max9768.c
index 4c300f317c3a,e1c196a41930,e1c196a41930,e1c196a41930,f987497a8411,e1c196a41930..bd41128c6f0b
--- a/sound/soc/codecs/max9768.c
+++ b/sound/soc/codecs/max9768.c
@@@@@@@ -218,8 -242,10 -242,10 -242,10 -242,9 -242,10 +218,8 @@@@@@@ MODULE_DEVICE_TABLE(i2c, max9768_i2c_id
      static struct i2c_driver max9768_i2c_driver = {
      	.driver = {
      		.name = "max9768",
 --- -		.owner = THIS_MODULE,
      	},
      	.probe = max9768_i2c_probe,
 -----	.remove = max9768_i2c_remove,
      	.id_table = max9768_i2c_id,
      };
      module_i2c_driver(max9768_i2c_driver);