From 8d71289d9fea115882e6da73bf7bae3e25a58c7c Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Thu, 4 Oct 2012 17:11:52 -0700 Subject: [PATCH] --- yaml --- r: 330043 b: refs/heads/master c: 19afa16f973c1f75bf3a7e70a0f79bcd7232f2b7 h: refs/heads/master i: 330041: 0d2c53b2ffb7c4c719972a2068cc973ec47a5455 330039: 9abdcf391d4fc08afa0fe129aefb6d00f0d434f0 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/wm8994-core.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4179299b1c9e..582d669ff13b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd0e981a6cc855a785e43d743c399196c144cdd6 +refs/heads/master: 19afa16f973c1f75bf3a7e70a0f79bcd7232f2b7 diff --git a/trunk/drivers/mfd/wm8994-core.c b/trunk/drivers/mfd/wm8994-core.c index 2febf88cfce8..dd8dfbee39ec 100644 --- a/trunk/drivers/mfd/wm8994-core.c +++ b/trunk/drivers/mfd/wm8994-core.c @@ -374,21 +374,21 @@ static int wm8994_ldo_in_use(struct wm8994_pdata *pdata, int ldo) } #endif -static const __devinitdata struct reg_default wm8994_revc_patch[] = { +static const __devinitconst struct reg_default wm8994_revc_patch[] = { { 0x102, 0x3 }, { 0x56, 0x3 }, { 0x817, 0x0 }, { 0x102, 0x0 }, }; -static const __devinitdata struct reg_default wm8958_reva_patch[] = { +static const __devinitconst struct reg_default wm8958_reva_patch[] = { { 0x102, 0x3 }, { 0xcb, 0x81 }, { 0x817, 0x0 }, { 0x102, 0x0 }, }; -static const __devinitdata struct reg_default wm1811_reva_patch[] = { +static const __devinitconst struct reg_default wm1811_reva_patch[] = { { 0x102, 0x3 }, { 0x56, 0x7 }, { 0x5d, 0x7e },