diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-06 15:14:47 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-06 15:14:47 +0100 |
| commit | 0afc8c733e95642ee9200966081da82564af8f8f (patch) | |
| tree | 01dfd20489e9cec42f43bc0588cf82989fcc132e /include | |
| parent | ASoC: soc-cache: Add optional cache name member to snd_soc_cache_ops (diff) | |
| parent | ASoC: Hold client_mutex while calling snd_soc_instantiate_cards() (diff) | |
| download | linux-0afc8c733e95642ee9200966081da82564af8f8f.tar.xz linux-0afc8c733e95642ee9200966081da82564af8f8f.zip | |
Merge branch 'for-2.6.37' into for-2.6.38
Conflicts:
include/linux/mfd/wm8994/pdata.h
Diffstat (limited to 'include')
| -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 { #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 |