Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / sound / soc / codecs / wm8960.h

diff --git a/sound/soc/codecs/wm8960.h b/sound/soc/codecs/wm8960.h
index c9af56c..a5ef654 100644 (file)
--- a/sound/soc/codecs/wm8960.h
+++ b/sound/soc/codecs/wm8960.h
@@ -76,7 +76,6 @@
 #define WM8960_OPCLKDIV                        2
 #define WM8960_DCLKDIV                 3
 #define WM8960_TOCLKSEL                        4
-#define WM8960_SYSCLKSEL               5
 
 #define WM8960_SYSCLK_DIV_1            (0 << 1)
 #define WM8960_SYSCLK_DIV_2            (2 << 1)
@@ -114,14 +113,4 @@
 extern struct snd_soc_dai wm8960_dai;
 extern struct snd_soc_codec_device soc_codec_dev_wm8960;
 
-#define WM8960_DRES_400R 0
-#define WM8960_DRES_200R 1
-#define WM8960_DRES_600R 2
-#define WM8960_DRES_150R 3
-#define WM8960_DRES_MAX  3
-
-struct wm8960_data {
-       int dres;
-};
-
 #endif