diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-09-22 07:19:07 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-09-22 07:19:07 -0400 |
| commit | 0704129ff4e51402bf7b16064a54ff8f7889e962 (patch) | |
| tree | e36209daa68c1cff63371fd35b3ba79e63edb687 /sound/soc/omap | |
| parent | d71b3576f2be6131f5b9e2c300cb2a03621e62e0 (diff) | |
| parent | 7d1be0a6789f7d04e5104b1d2873268369eafcc2 (diff) | |
Merge branch 'for-2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into for-2.6.37
Diffstat (limited to 'sound/soc/omap')
| -rw-r--r-- | sound/soc/omap/omap-mcbsp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 7ba5690118f..99696187b55 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c | |||
| @@ -759,7 +759,7 @@ static struct snd_soc_dai_driver omap_mcbsp_dai = | |||
| 759 | .ops = &mcbsp_dai_ops, | 759 | .ops = &mcbsp_dai_ops, |
| 760 | }; | 760 | }; |
| 761 | 761 | ||
| 762 | int omap_mcbsp_st_info_volsw(struct snd_kcontrol *kcontrol, | 762 | static int omap_mcbsp_st_info_volsw(struct snd_kcontrol *kcontrol, |
| 763 | struct snd_ctl_elem_info *uinfo) | 763 | struct snd_ctl_elem_info *uinfo) |
| 764 | { | 764 | { |
| 765 | struct soc_mixer_control *mc = | 765 | struct soc_mixer_control *mc = |