diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-04 17:30:01 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-04 17:30:01 (GMT) |
| commit | 986a622df307644af14618bee54c901aa74816da (patch) | |
| tree | 6da87812b9120634381e3e3987e115f90bd562e0 /sound/soc/codecs/wm8994.h | |
| parent | 8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 (diff) | |
| parent | 28e5ca73ef9072ed58dbb81cfff6f908be8e3cd4 (diff) | |
| download | linux-fsl-qoriq-986a622df307644af14618bee54c901aa74816da.tar.xz | |
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus
Diffstat (limited to 'sound/soc/codecs/wm8994.h')
| -rw-r--r-- | sound/soc/codecs/wm8994.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8994.h b/sound/soc/codecs/wm8994.h index 55ddf4d..6536f8d 100644 --- a/sound/soc/codecs/wm8994.h +++ b/sound/soc/codecs/wm8994.h @@ -134,6 +134,9 @@ struct wm8994_priv { struct mutex accdet_lock; struct wm8994_micdet micdet[2]; struct delayed_work mic_work; + struct delayed_work open_circuit_work; + struct delayed_work mic_complete_work; + u16 mic_status; bool mic_detecting; bool jack_mic; int btn_mask; |