lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sections: fix section conflicts in arch/powerpc

Browse Source 
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>
This commit is contained in:
Andi Kleen
2012-10-04 17:11:37 -07:00
committed by Linus Torvalds
parent 3cf5ae6e64
commit 9597abe00c
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/platforms/40x/ppc40x_simple.c
View File

@@ -50,7 +50,7 @@ machine_device_initcall(ppc40x_simple, ppc40x_device_probe);
* Again, if your board needs to do things differently then create a * Again, if your board needs to do things differently then create a
* board.c file for it rather than adding it to this list. * 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,acadia",
"amcc,haleakala", "amcc,haleakala",
"amcc,kilauea", "amcc,kilauea",

2
arch/powerpc/platforms/512x/mpc5121_generic.c
View File

@@ -26,7 +26,7 @@
/* /*
* list of supported boards * list of supported boards
*/ */
static const char *board[] __initdata = { static const char * const board[] __initconst = {
"prt,prtlvt", "prt,prtlvt",
NULL NULL
}; };

2
arch/powerpc/platforms/52xx/lite5200.c
View File

@@ -172,7 +172,7 @@ static void __init lite5200_setup_arch(void)
mpc52xx_setup_pci(); mpc52xx_setup_pci();
} }
static const char *board[] __initdata = { static const char * const board[] __initconst = {
"fsl,lite5200", "fsl,lite5200",
"fsl,lite5200b", "fsl,lite5200b",
NULL, NULL,

2
arch/powerpc/platforms/52xx/media5200.c
View File

@@ -232,7 +232,7 @@ static void __init media5200_setup_arch(void)
} }
/* list of the supported boards */ /* list of the supported boards */
static const char *board[] __initdata = { static const char * const board[] __initconst = {
"fsl,media5200", "fsl,media5200",
NULL NULL
}; };

2
arch/powerpc/platforms/83xx/mpc837x_rdb.c
View File

@@ -60,7 +60,7 @@ static void __init mpc837x_rdb_setup_arch(void)
machine_device_initcall(mpc837x_rdb, mpc83xx_declare_of_platform_devices); machine_device_initcall(mpc837x_rdb, mpc83xx_declare_of_platform_devices);
static const char *board[] __initdata = { static const char * const board[] __initconst = {
"fsl,mpc8377rdb", "fsl,mpc8377rdb",
"fsl,mpc8378rdb", "fsl,mpc8378rdb",
"fsl,mpc8379rdb", "fsl,mpc8379rdb",

2
arch/powerpc/platforms/85xx/tqm85xx.c
View File

@@ -125,7 +125,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_1520,
machine_device_initcall(tqm85xx, mpc85xx_common_publish_devices); machine_device_initcall(tqm85xx, mpc85xx_common_publish_devices);
static const char *board[] __initdata = { static const char * const board[] __initconst = {
"tqc,tqm8540", "tqc,tqm8540",
"tqc,tqm8541", "tqc,tqm8541",
"tqc,tqm8548", "tqc,tqm8548",