lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sections: fix section conflicts in drivers/mfd

Browse Source 
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Andi Kleen
2012-10-04 17:11:52 -07:00
committed by Linus Torvalds
parent dd0e981a6c
commit 19afa16f97
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mfd/wm8994-core.c
View File

@@ -374,21 +374,21 @@ static int wm8994_ldo_in_use(struct wm8994_pdata *pdata, int ldo)
} }
#endif #endif
static const __devinitdata struct reg_default wm8994_revc_patch[] = { static const __devinitconst struct reg_default wm8994_revc_patch[] = {
{ 0x102, 0x3 }, { 0x102, 0x3 },
{ 0x56, 0x3 }, { 0x56, 0x3 },
{ 0x817, 0x0 }, { 0x817, 0x0 },
{ 0x102, 0x0 }, { 0x102, 0x0 },
}; };
static const __devinitdata struct reg_default wm8958_reva_patch[] = { static const __devinitconst struct reg_default wm8958_reva_patch[] = {
{ 0x102, 0x3 }, { 0x102, 0x3 },
{ 0xcb, 0x81 }, { 0xcb, 0x81 },
{ 0x817, 0x0 }, { 0x817, 0x0 },
{ 0x102, 0x0 }, { 0x102, 0x0 },
}; };
static const __devinitdata struct reg_default wm1811_reva_patch[] = { static const __devinitconst struct reg_default wm1811_reva_patch[] = {
{ 0x102, 0x3 }, { 0x102, 0x3 },
{ 0x56, 0x7 }, { 0x56, 0x7 },
{ 0x5d, 0x7e }, { 0x5d, 0x7e },