Merge branch 'master' into csb1725

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

diff --git a/sound/soc/codecs/wm8731.h b/sound/soc/codecs/wm8731.h
index cd7b806e8ad0b745db1116f40b1682733f8d1780..e9c0c76ab73bf4ca72f667e5ef2d2d063ff5028a 100644 (file)
--- a/sound/soc/codecs/wm8731.h
+++ b/sound/soc/codecs/wm8731.h
@@ -31,10 +31,9 @@
 
 #define WM8731_CACHEREGNUM     10
 
-#define WM8731_SYSCLK  0
-#define WM8731_DAI             0
+#define WM8731_SYSCLK_XTAL 1
+#define WM8731_SYSCLK_MCLK 2
 
-extern struct snd_soc_dai wm8731_dai;
-extern struct snd_soc_codec_device soc_codec_dev_wm8731;
+#define WM8731_DAI             0
 
 #endif