diff --git a/[refs] b/[refs] index 794d76eb439a..04fbe916eb63 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c574358e8b48adf646f9d5ef70dc76c5d4ad9387 +refs/heads/master: 00d3803b656a5f0935518d746f6bb27d5181d29d diff --git a/trunk/drivers/mfd/ab3100-core.c b/trunk/drivers/mfd/ab3100-core.c index c533f86ff5ea..5447da16a170 100644 --- a/trunk/drivers/mfd/ab3100-core.c +++ b/trunk/drivers/mfd/ab3100-core.c @@ -647,7 +647,7 @@ struct ab3100_init_setting { u8 setting; }; -static const struct ab3100_init_setting __initdata +static const struct ab3100_init_setting __initconst ab3100_init_settings[] = { { .abreg = AB3100_MCA,