Merge branch 'master' into tk71

[mv-sheeva.git] / sound / soc / codecs / twl6040.h

diff --git a/sound/soc/codecs/twl6040.h b/sound/soc/codecs/twl6040.h
index c472070a1da2c93544cc67e9fe827eb5d146eccd..23aeed0963e69dbdcf72387bffb9526f270c299b 100644 (file)
--- a/sound/soc/codecs/twl6040.h
+++ b/sound/soc/codecs/twl6040.h
@@ -79,6 +79,7 @@
 
 /* INTMR (0x04) fields */
 
+#define TWL6040_PLUGMSK                        0x02
 #define TWL6040_READYMSK               0x40
 #define TWL6040_ALLINT_MSK             0x7B
 
@@ -135,7 +136,11 @@
 #define TWL6040_HPPLL_ID               1
 #define TWL6040_LPPLL_ID               2
 
-extern struct snd_soc_dai twl6040_dai;
-extern struct snd_soc_codec_device soc_codec_dev_twl6040;
+/* STATUS (0x2E) fields */
+
+#define TWL6040_PLUGCOMP               0x02
+
+void twl6040_hs_jack_detect(struct snd_soc_codec *codec,
+                           struct snd_soc_jack *jack, int report);
 
 #endif /* End of __TWL6040_H__ */