diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-07-01 08:27:25 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-07-01 08:27:25 (GMT) |
| commit | bc32134c0523c60989d2f2439e176601668a62a5 (patch) | |
| tree | 03f63fc387e78592968a1f04ee4e173ca32fec20 /sound/soc/pxa/mmp-sspa.c | |
| parent | 1c6770a38a6652777b9d1592b66e0d8e7dfb6160 (diff) | |
| parent | 066624c6a1733a72a67f1d06d35a2153e7d9082b (diff) | |
| download | linux-fsl-qoriq-bc32134c0523c60989d2f2439e176601668a62a5.tar.xz | |
Merge branch 'for-next' into for-linus
Merge the whole changes for 3.11-rc1 merge
Diffstat (limited to 'sound/soc/pxa/mmp-sspa.c')
| -rw-r--r-- | sound/soc/pxa/mmp-sspa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/pxa/mmp-sspa.c b/sound/soc/pxa/mmp-sspa.c index a647799..62142ce 100644 --- a/sound/soc/pxa/mmp-sspa.c +++ b/sound/soc/pxa/mmp-sspa.c @@ -388,7 +388,7 @@ static struct snd_soc_dai_ops mmp_sspa_dai_ops = { .set_fmt = mmp_sspa_set_dai_fmt, }; -struct snd_soc_dai_driver mmp_sspa_dai = { +static struct snd_soc_dai_driver mmp_sspa_dai = { .probe = mmp_sspa_probe, .playback = { .channels_min = 1, |