xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-2.6.37' into for-2.6.38

Browse Source 
Conflicts:
	include/linux/mfd/wm8994/pdata.h
This commit is contained in:
Mark Brown
2010-12-06 14:14:47 +00:00
parent 0d735eaa2c 1dcb4f38e5
commit 0afc8c733e
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/mfd/wm8994/pdata.h
View File

@@ -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