diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2009-09-21 17:01:07 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-10-05 09:31:34 -0700 |
commit | 02e87c91e8a4bc57547925317f876aac779a433d (patch) | |
tree | cd02eaea1865578953490b948e0d98ea8f718a46 | |
parent | c9aac6645fcf788ba660ba456ec0cf9fd2f6f0f8 (diff) | |
download | linux-jz47xx-02e87c91e8a4bc57547925317f876aac779a433d.tar.gz |
drivers/mfd/ab3100-core.c: fix powerpc build error
commit 00d3803b656a5f0935518d746f6bb27d5181d29d upstream.
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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/mfd/ab3100-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/ab3100-core.c b/drivers/mfd/ab3100-core.c index 13e7d7bfe85..dd8b6b3ff1e 100644 --- a/drivers/mfd/ab3100-core.c +++ b/drivers/mfd/ab3100-core.c @@ -643,7 +643,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, |