diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-22 14:28:48 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-22 14:28:48 +0100 |
| commit | 3f151cbf76ab5d60abd0d3f8b777a50722b64ccb (patch) | |
| tree | f13da3da5bf74c6e8fa6d59efd47b4a854dfcac3 /sound | |
| parent | 79916433f8549564038a7faae26e3ec4135f4b5d (diff) | |
| parent | 74b45231b23d47b041b137737241d482481a76a9 (diff) | |
| download | linux-3f151cbf76ab5d60abd0d3f8b777a50722b64ccb.tar.gz | |
Merge remote-tracking branch 'asoc/topic/s6000' into asoc-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/s6000/s6105-ipcam.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/s6000/s6105-ipcam.c b/sound/soc/s6000/s6105-ipcam.c index 58cfb1eb7dd3ae..945e8abdc10fbf 100644 --- 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, |