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/codecs/wm8903.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/codecs/wm8903.c')
-rw-r--r-- | sound/soc/codecs/wm8903.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c index 9d88437..fa24ced 100644 --- a/sound/soc/codecs/wm8903.c +++ b/sound/soc/codecs/wm8903.c @@ -403,10 +403,8 @@ static int wm8903_class_w_put(struct snd_kcontrol *kcontrol, } #define SOC_DAPM_SINGLE_W(xname, reg, shift, max, invert) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ - .info = snd_soc_info_volsw, \ - .get = snd_soc_dapm_get_volsw, .put = wm8903_class_w_put, \ - .private_value = SOC_SINGLE_VALUE(reg, shift, max, invert) } + SOC_SINGLE_EXT(xname, reg, shift, max, invert, \ + snd_soc_dapm_get_volsw, wm8903_class_w_put) static int wm8903_deemph[] = { 0, 32000, 44100, 48000 }; |