summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/40x
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2012-10-04 17:11:37 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-06 03:04:39 +0900
commit9597abe00c1bab2aedce6b49866bf6d1e81c9eed (patch)
treea0a99118c3d827ca37971f54e437d84a1113061d /arch/powerpc/platforms/40x
parent3cf5ae6e64507541ce00893e6459da3ef3d4fd6b (diff)
downloadop-kernel-dev-9597abe00c1bab2aedce6b49866bf6d1e81c9eed.zip
op-kernel-dev-9597abe00c1bab2aedce6b49866bf6d1e81c9eed.tar.gz
sections: fix section conflicts in arch/powerpc
Signed-off-by: Andi Kleen <ak@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>
Diffstat (limited to 'arch/powerpc/platforms/40x')
-rw-r--r--arch/powerpc/platforms/40x/ppc40x_simple.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/40x/ppc40x_simple.c b/arch/powerpc/platforms/40x/ppc40x_simple.c
index 9761206..969dddc 100644
--- a/arch/powerpc/platforms/40x/ppc40x_simple.c
+++ b/arch/powerpc/platforms/40x/ppc40x_simple.c
@@ -50,7 +50,7 @@ machine_device_initcall(ppc40x_simple, ppc40x_device_probe);
* Again, if your board needs to do things differently then create a
* board.c file for it rather than adding it to this list.
*/
-static const char *board[] __initdata = {
+static const char * const board[] __initconst = {
"amcc,acadia",
"amcc,haleakala",
"amcc,kilauea",
OpenPOWER on IntegriCloud