aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/85xx/tqm85xx.c
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2012-10-04 20:11:37 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-05 14:04:39 -0400
commit9597abe00c1bab2aedce6b49866bf6d1e81c9eed (patch)
treea0a99118c3d827ca37971f54e437d84a1113061d /arch/powerpc/platforms/85xx/tqm85xx.c
parent3cf5ae6e64507541ce00893e6459da3ef3d4fd6b (diff)
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/85xx/tqm85xx.c')
-rw-r--r--arch/powerpc/platforms/85xx/tqm85xx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/85xx/tqm85xx.c b/arch/powerpc/platforms/85xx/tqm85xx.c
index 3e70a2035e53..b62fa87521a3 100644
--- a/arch/powerpc/platforms/85xx/tqm85xx.c
+++ b/arch/powerpc/platforms/85xx/tqm85xx.c
@@ -125,7 +125,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_1520,
125 125
126machine_device_initcall(tqm85xx, mpc85xx_common_publish_devices); 126machine_device_initcall(tqm85xx, mpc85xx_common_publish_devices);
127 127
128static const char *board[] __initdata = { 128static const char * const board[] __initconst = {
129 "tqc,tqm8540", 129 "tqc,tqm8540",
130 "tqc,tqm8541", 130 "tqc,tqm8541",
131 "tqc,tqm8548", 131 "tqc,tqm8548",