diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-17 17:20:32 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-17 17:20:32 +0100 |
| commit | 5464389755b78e235c999c2dcf58718d23326d46 (patch) | |
| tree | a21c3bb7c2fdc087a3c30735ebfc481fc5798a0e /sound/soc/codecs/wm8994.h | |
| parent | f57019aa0a796251e671882004dd58d2cc55f8f1 (diff) | |
| parent | 2da1c4bf765cb32024e5db6fa75dab92916fa3b1 (diff) | |
Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-next
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 55ddf4d57d9..6536f8d45ac 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; |