From ed1fa0e6ccd832c795546f9363e64a922dd3425c Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Wed, 28 Mar 2012 20:52:24 +0100 Subject: [PATCH] --- yaml --- r: 305567 b: refs/heads/master c: eb794077b8fe343a6fdc0aa94ad1fc5388ddded5 h: refs/heads/master i: 305565: 379aa125028c05bc790e02a03f80330e30357364 305563: b54c6358362e8e2acb0bae910deacbc8d1295740 305559: e44865f58c9aee7e7921e59b48c09ba335274094 305551: d3ff783cd27f46e45b5e7fb736857816794a0c97 305535: 1415f009293bf60fe17086108c9bcf8b74325f41 v: v3 --- [refs] | 2 +- trunk/include/sound/soc-dapm.h | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 45e6ad1d7fb3..d75f86bc321d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8fc8ec92a5db47cdf3526adc5717041c611e5516 +refs/heads/master: eb794077b8fe343a6fdc0aa94ad1fc5388ddded5 diff --git a/trunk/include/sound/soc-dapm.h b/trunk/include/sound/soc-dapm.h index 7562b8fb6974..a53e231044a4 100644 --- a/trunk/include/sound/soc-dapm.h +++ b/trunk/include/sound/soc-dapm.h @@ -141,10 +141,6 @@ struct device; { .id = snd_soc_dapm_mixer, .name = wname, .reg = wreg, .shift = wshift, \ .invert = winvert, .kcontrol_news = wcontrols, \ .num_kcontrols = wncontrols, .event = wevent, .event_flags = wflags} -#define SND_SOC_DAPM_MICBIAS_E(wname, wreg, wshift, winvert, wevent, wflags) \ -{ .id = snd_soc_dapm_micbias, .name = wname, .reg = wreg, .shift = wshift, \ - .invert = winvert, .kcontrol_news = NULL, .num_kcontrols = 0, \ - .event = wevent, .event_flags = wflags} #define SND_SOC_DAPM_SWITCH_E(wname, wreg, wshift, winvert, wcontrols, \ wevent, wflags) \ { .id = snd_soc_dapm_switch, .name = wname, .reg = wreg, .shift = wshift, \