| Date | Thu, 01 Oct 2009 18:15:58 -0700 | From | Greg KH <> | Subject | [010/136] drivers/mfd/ab3100-core.c: fix powerpc build error |
| |
2.6.31-stable review patch. If anyone has any objections, please let us know.
------------------ From: Andrew Morton <akpm@linux-foundation.org>
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>
--- drivers/mfd/ab3100-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- 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,
|