summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2009-09-21 17:01:07 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-22 07:17:24 -0700
commit00d3803b656a5f0935518d746f6bb27d5181d29d (patch)
tree75efc8a88dc2a1f5c81f338edd228864a3b0dfee /drivers
parentc574358e8b48adf646f9d5ef70dc76c5d4ad9387 (diff)
downloadop-kernel-dev-00d3803b656a5f0935518d746f6bb27d5181d29d.zip
op-kernel-dev-00d3803b656a5f0935518d746f6bb27d5181d29d.tar.gz
drivers/mfd/ab3100-core.c: fix powerpc build error
drivers/mfd/ab3100-core.c:647: error: ab3100_init_settings causes a section type conflict Cc: Anton Vorontsov <avorontsov@ru.mvista.com> Cc: Samuel Ortiz <sameo@linux.intel.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mfd/ab3100-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/ab3100-core.c b/drivers/mfd/ab3100-core.c
index c533f86..5447da1 100644
--- a/drivers/mfd/ab3100-core.c
+++ b/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,
OpenPOWER on IntegriCloud