Merge remote-tracking branch 'asoc/topic/s6000' into asoc-next

3f151cbf · Mark Brown · 79916433 · 74b45231 · 3f151cbf
Commit 3f151cbf authored Aug 22, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sound/soc/s6000/s6105-ipcam.c sound/soc/s6000/s6105-ipcam.c +1 -1

No files found.
--- a/sound/soc/s6000/s6105-ipcam.c
+++ b/sound/soc/s6000/s6105-ipcam.c
@@ -192,7 +192,7 @@ static struct snd_soc_card snd_soc_card_s6105 = {
 	.num_links = 1,
 };

-static struct s6000_snd_platform_data __initdata s6105_snd_data = {
+static struct s6000_snd_platform_data s6105_snd_data __initdata = {
 	.wide		= 0,
 	.channel_in	= 0,
 	.channel_out	= 1,