diff --git a/[refs] b/[refs] index bcb0d2626617..ca38f2970104 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 42c2544b2d7d4f287bfa239455af09b6408476e2 +refs/heads/master: 2f8491d321d9313dfd854001dd196fd7835b6ac2 diff --git a/trunk/drivers/mfd/ab3100-core.c b/trunk/drivers/mfd/ab3100-core.c index a20e1c41bed2..4f5725508ac0 100644 --- a/trunk/drivers/mfd/ab3100-core.c +++ b/trunk/drivers/mfd/ab3100-core.c @@ -809,7 +809,7 @@ struct ab_family_id { char *name; }; -static const struct ab_family_id ids[] __devinitdata = { +static const struct ab_family_id ids[] __devinitconst = { /* AB3100 */ { .id = 0xc0,