diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2009-09-21 20:01:07 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-22 10:17:24 -0400 |
commit | 00d3803b656a5f0935518d746f6bb27d5181d29d (patch) | |
tree | 75efc8a88dc2a1f5c81f338edd228864a3b0dfee /drivers/mfd | |
parent | c574358e8b48adf646f9d5ef70dc76c5d4ad9387 (diff) |
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/mfd')
-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 c533f86ff5ea..5447da16a170 100644 --- a/drivers/mfd/ab3100-core.c +++ b/drivers/mfd/ab3100-core.c | |||
@@ -647,7 +647,7 @@ struct ab3100_init_setting { | |||
647 | u8 setting; | 647 | u8 setting; |
648 | }; | 648 | }; |
649 | 649 | ||
650 | static const struct ab3100_init_setting __initdata | 650 | static const struct ab3100_init_setting __initconst |
651 | ab3100_init_settings[] = { | 651 | ab3100_init_settings[] = { |
652 | { | 652 | { |
653 | .abreg = AB3100_MCA, | 653 | .abreg = AB3100_MCA, |