diff options
author | Liam Girdwood | 2010-11-03 15:11:27 +0100 |
---|---|---|
committer | Liam Girdwood | 2010-11-03 15:11:27 +0100 |
commit | 8f987768eb99631374f4ab0bb19cd062baf1397d (patch) | |
tree | b89aa5c207f7ba6a688f45657424b937f17ceb8a /sound/soc/codecs/wm8962.h | |
parent | ASoC: tpa6130a2: Fix unbalanced regulator disables (diff) | |
parent | Linux 2.6.37-rc1 (diff) | |
download | kernel-qcow2-linux-8f987768eb99631374f4ab0bb19cd062baf1397d.tar.gz kernel-qcow2-linux-8f987768eb99631374f4ab0bb19cd062baf1397d.tar.xz kernel-qcow2-linux-8f987768eb99631374f4ab0bb19cd062baf1397d.zip |
Merge commit 'v2.6.37-rc1' into for-2.6.37
Diffstat (limited to 'sound/soc/codecs/wm8962.h')
-rw-r--r-- | sound/soc/codecs/wm8962.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/sound/soc/codecs/wm8962.h b/sound/soc/codecs/wm8962.h index 2af6c9371fcc..a1a5d5294c19 100644 --- a/sound/soc/codecs/wm8962.h +++ b/sound/soc/codecs/wm8962.h @@ -3775,17 +3775,6 @@ #define WM8962_VSS_ENA_SHIFT 0 /* VSS_ENA */ #define WM8962_VSS_ENA_WIDTH 1 /* VSS_ENA */ -extern const u16 wm8962_reg[WM8962_MAX_REGISTER + 1]; - -struct wm8962_reg_access { - u16 read; - u16 write; - u16 vol; -}; - -extern -const struct wm8962_reg_access wm8962_reg_access[WM8962_MAX_REGISTER + 1]; - int wm8962_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack); #endif |