Merge branch 'master' into fixes

1 files changed, 2 insertions, 1 deletions

diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c
index 4cabb74d97e..fada6ef43ee 100644
--- a/sound/soc/omap/rx51.c
+++ b/sound/soc/omap/rx51.c
@@ -365,7 +365,7 @@ static struct snd_soc_dai_link rx51_dai[] = {
         },
 };
 
-struct snd_soc_aux_dev rx51_aux_dev[] = {
+static struct snd_soc_aux_dev rx51_aux_dev[] = {
         {
                 .name = "TLV320AIC34b",
                 .codec_name = "tlv320aic3x-codec.2-0019",
@@ -383,6 +383,7 @@ static struct snd_soc_codec_conf rx51_codec_conf[] = {
 /* Audio card */
 static struct snd_soc_card rx51_sound_card = {
         .name = "RX-51",
+        .owner = THIS_MODULE,
         .dai_link = rx51_dai,
         .num_links = ARRAY_SIZE(rx51_dai),
         .aux_dev = rx51_aux_dev,