Merge tag 'v4.3-rc1' into MTD -next development

[deliverable/linux.git] / sound / soc / codecs / ics43432.c

diff --git a/sound/soc/codecs/ics43432.c b/sound/soc/codecs/ics43432.c
index 4f202c15df395fe6c66ee8a397a1f3d5e5415b3e..dd850b93938d53737fe222e3e8c3b0dfee834280 100644 (file)
--- a/sound/soc/codecs/ics43432.c
+++ b/sound/soc/codecs/ics43432.c
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 2015 Axis Communications AB
  *
- * Licensed under GPL2.
+ * Licensed under GPL v2.
  */
 
 #include <linux/module.h>
@@ -57,13 +57,12 @@ static const struct of_device_id ics43432_ids[] = {
        { .compatible = "invensense,ics43432", },
        { }
 };
-MODULE_DEVICE_TABLE(of, ics43432_dt_ids);
+MODULE_DEVICE_TABLE(of, ics43432_ids);
 #endif
 
 static struct platform_driver ics43432_driver = {
        .driver = {
                .name = "ics43432",
-               .owner = THIS_MODULE,
                .of_match_table = of_match_ptr(ics43432_ids),
        },
        .probe = ics43432_probe,
@@ -74,4 +73,4 @@ module_platform_driver(ics43432_driver);
 
 MODULE_DESCRIPTION("ASoC ICS43432 driver");
 MODULE_AUTHOR("Ricard Wanderlof <ricardw@axis.com>");
-MODULE_LICENSE("GPLv2");
+MODULE_LICENSE("GPL v2");