projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e1412e6 04d2868)
Merge branch 'for-2.6.38' into for-2.6.39
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 1 Mar 2011 23:29:04 +0000 (23:29 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 1 Mar 2011 23:29:04 +0000 (23:29 +0000)
1  2 
sound/soc/codecs/wm8994.c patch | diff1 | diff2 | blob | history
sound/soc/codecs/wm9081.c patch | diff1 | diff2 | blob | history

diff --cc sound/soc/codecs/wm8994.c
index 0dc14115f109675e61aadba2471c9bf0968c8a1f,4afbe3b2e443689c22e920874b67eb0d17879805..b17ac1971b0d6b57c55a656b301575f5662ef8bd
--- 1/sound/soc/codecs/wm8994.c
--- 2/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@@ -109,9 -110,12 +109,12 @@@ struct wm8994_priv 
  
        unsigned int aif1clk_enable:1;
        unsigned int aif2clk_enable:1;
+ 
+       unsigned int aif1clk_disable:1;
+       unsigned int aif2clk_disable:1;
  };
  
 -static int wm8994_readable(unsigned int reg)
 +static int wm8994_readable(struct snd_soc_codec *codec, unsigned int reg)
  {
        switch (reg) {
        case WM8994_GPIO_1:
diff --cc sound/soc/codecs/wm9081.c
Simple merge