include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[net-next-2.6.git] / sound / soc / codecs / wm8974.c

diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c
index 8812751da8c9838c484ffe66ae1d0e0eb8858546..69708c4cc004c9de2abb1f6bdd781c0634307d93 100644 (file)
--- a/sound/soc/codecs/wm8974.c
+++ b/sound/soc/codecs/wm8974.c
@@ -18,6 +18,7 @@
 #include <linux/pm.h>
 #include <linux/i2c.h>
 #include <linux/platform_device.h>
+#include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -170,6 +171,10 @@ SOC_ENUM("Aux Mode", wm8974_auxmode),
 
 SOC_SINGLE("Capture Boost(+20dB)", WM8974_ADCBOOST,  8, 1, 0),
 SOC_SINGLE("Mono Playback Switch", WM8974_MONOMIX, 6, 1, 1),
+
+/* DAC / ADC oversampling */
+SOC_SINGLE("DAC 128x Oversampling Switch", WM8974_DAC, 8, 1, 0),
+SOC_SINGLE("ADC 128x Oversampling Switch", WM8974_ADC, 8, 1, 0),
 };
 
 /* Speaker Output Mixer */
@@ -381,14 +386,6 @@ static int wm8974_set_dai_clkdiv(struct snd_soc_dai *codec_dai,
                reg = snd_soc_read(codec, WM8974_CLOCK) & 0x11f;
                snd_soc_write(codec, WM8974_CLOCK, reg | div);
                break;
-       case WM8974_ADCCLK:
-               reg = snd_soc_read(codec, WM8974_ADC) & 0x1f7;
-               snd_soc_write(codec, WM8974_ADC, reg | div);
-               break;
-       case WM8974_DACCLK:
-               reg = snd_soc_read(codec, WM8974_DAC) & 0x1f7;
-               snd_soc_write(codec, WM8974_DAC, reg | div);
-               break;
        case WM8974_BCLKDIV:
                reg = snd_soc_read(codec, WM8974_CLOCK) & 0x1e3;
                snd_soc_write(codec, WM8974_CLOCK, reg | div);