From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 6 Dec 2010 14:14:47 +0000 (+0000)
Subject: Merge branch 'for-2.6.37' into for-2.6.38
X-Git-Tag: v2.6.38-rc1~7^2^2~78
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0afc8c733e95642ee9200966081da82564af8f8f;p=platform%2Fkernel%2Flinux-stable.git

Merge branch 'for-2.6.37' into for-2.6.38

Conflicts:
	include/linux/mfd/wm8994/pdata.h
---

0afc8c733e95642ee9200966081da82564af8f8f
diff --cc include/linux/mfd/wm8994/pdata.h
index 882b51a,add8a1b..9eab263
--- a/include/linux/mfd/wm8994/pdata.h
+++ b/include/linux/mfd/wm8994/pdata.h
@@@ -29,9 -29,7 +29,9 @@@ struct wm8994_ldo_pdata 
  #define WM8994_CONFIGURE_GPIO 0x8000
  
  #define WM8994_DRC_REGS 5
- #define WM8994_EQ_REGS  19
+ #define WM8994_EQ_REGS  20
 +#define WM8958_MBC_CUTOFF_REGS 20
 +#define WM8958_MBC_COEFF_REGS  48
  
  /**
   * DRC configurations are specified with a label and a set of register