From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 1 Mar 2011 23:29:04 +0000 (+0000)
Subject: Merge branch 'for-2.6.38' into for-2.6.39
X-Git-Tag: v2.6.39-rc1~200^2^2~52
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c496ccd5dbd8bd25a8817bc2a901adec153a41e1;p=~shefty%2Frdma-dev.git

Merge branch 'for-2.6.38' into for-2.6.39
---

c496ccd5dbd8bd25a8817bc2a901adec153a41e1
diff --cc sound/soc/codecs/wm8994.c
index 0dc14115f10,4afbe3b2e44..b17ac1971b0
--- a/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: