Merge git://www.linux-watchdog.org/linux-watchdog

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

diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c
index 5740cab685248fed9f44a7a764f1abbcb87ab3c0..ccb3b15139ad9dacd41ad801201471d1ed696997 100644 (file)
--- a/sound/soc/codecs/wm9081.c
+++ b/sound/soc/codecs/wm9081.c
@@ -30,7 +30,7 @@
 #include <sound/wm9081.h>
 #include "wm9081.h"
 
-static struct reg_default wm9081_reg[] = {
+static const struct reg_default wm9081_reg[] = {
        {  2, 0x00B9 },     /* R2  - Analogue Lineout */
        {  3, 0x00B9 },     /* R3  - Analogue Speaker PGA */
        {  4, 0x0001 },     /* R4  - VMID Control */
@@ -1377,7 +1377,6 @@ MODULE_DEVICE_TABLE(i2c, wm9081_i2c_id);
 static struct i2c_driver wm9081_i2c_driver = {
        .driver = {
                .name = "wm9081",
-               .owner = THIS_MODULE,
        },
        .probe =    wm9081_i2c_probe,
        .remove =   wm9081_i2c_remove,