diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-06 09:14:47 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-06 09:14:47 -0500 |
| commit | 0afc8c733e95642ee9200966081da82564af8f8f (patch) | |
| tree | 01dfd20489e9cec42f43bc0588cf82989fcc132e /include/linux/mfd/wm8994 | |
| parent | 0d735eaa2c1d80c997fd775b679e36b80b8e85d1 (diff) | |
| parent | 1dcb4f38e5bc28dfce0f8c7eef184a090b03bfc7 (diff) | |
Merge branch 'for-2.6.37' into for-2.6.38
Conflicts:
include/linux/mfd/wm8994/pdata.h
Diffstat (limited to 'include/linux/mfd/wm8994')
| -rw-r--r-- | include/linux/mfd/wm8994/pdata.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mfd/wm8994/pdata.h b/include/linux/mfd/wm8994/pdata.h index 882b51aefbc0..9eab263658be 100644 --- a/include/linux/mfd/wm8994/pdata.h +++ b/include/linux/mfd/wm8994/pdata.h | |||
| @@ -29,7 +29,7 @@ struct wm8994_ldo_pdata { | |||
| 29 | #define WM8994_CONFIGURE_GPIO 0x8000 | 29 | #define WM8994_CONFIGURE_GPIO 0x8000 |
| 30 | 30 | ||
| 31 | #define WM8994_DRC_REGS 5 | 31 | #define WM8994_DRC_REGS 5 |
| 32 | #define WM8994_EQ_REGS 19 | 32 | #define WM8994_EQ_REGS 20 |
| 33 | #define WM8958_MBC_CUTOFF_REGS 20 | 33 | #define WM8958_MBC_CUTOFF_REGS 20 |
| 34 | #define WM8958_MBC_COEFF_REGS 48 | 34 | #define WM8958_MBC_COEFF_REGS 48 |
| 35 | 35 | ||