Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19afa16f authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

sections: fix section conflicts in drivers/mfd 



Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dd0e981a

drivers/mfd/wm8994-core.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -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 },