diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-30 11:42:24 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-30 11:42:24 (GMT) |
| commit | e4ca49d5d832c3eff23a44aacf21387629b1207b (patch) | |
| tree | 997849dbb46b424ff52604b0345bf1267054310f /sound/soc/codecs/88pm860x-codec.c | |
| parent | fbc6c4ee659da5bdd49ab85c5d7e50c51db1b4fa (diff) | |
| parent | f0ddb219c9f92d0c43582a000e1ddc0a4ee43222 (diff) | |
| download | linux-fsl-qoriq-e4ca49d5d832c3eff23a44aacf21387629b1207b.tar.xz | |
Merge remote-tracking branch 'asoc/topic/ext' into asoc-next
Diffstat (limited to 'sound/soc/codecs/88pm860x-codec.c')
| -rw-r--r-- | sound/soc/codecs/88pm860x-codec.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/codecs/88pm860x-codec.c b/sound/soc/codecs/88pm860x-codec.c index 60159c0..e2bd3dd 100644 --- a/sound/soc/codecs/88pm860x-codec.c +++ b/sound/soc/codecs/88pm860x-codec.c @@ -120,10 +120,8 @@ * before DAC & PGA in DAPM power-off sequence. */ #define PM860X_DAPM_OUTPUT(wname, wevent) \ -{ .id = snd_soc_dapm_pga, .name = wname, .reg = SND_SOC_NOPM, \ - .shift = 0, .invert = 0, .kcontrol_news = NULL, \ - .num_kcontrols = 0, .event = wevent, \ - .event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD, } + SND_SOC_DAPM_PGA_E(wname, SND_SOC_NOPM, 0, 0, NULL, 0, wevent, \ + SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD) struct pm860x_det { struct snd_soc_jack *hp_jack; |