From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sun, 13 Feb 2011 19:51:04 +0000 (+0000)
Subject: Merge branch 'for-2.6.38' into for-2.6.39
X-Git-Tag: Ubuntu-5.2.0-15.16~18854^2~1115^2~141
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f98dedcefdbcbe8d51e77d911583ecc2c2668174;p=mirror_ubuntu-eoan-kernel.git

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

f98dedcefdbcbe8d51e77d911583ecc2c2668174
diff --cc sound/soc/codecs/wm8994.c
index 0024b4cb8b23,a60b5dbf0154..d78abeceaeda
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@@ -107,9 -107,12 +107,12 @@@ struct wm8994_priv 
  
  	int revision;
  	struct wm8994_pdata *pdata;
+ 
+ 	unsigned int aif1clk_enable:1;
+ 	unsigned int aif2clk_enable: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: