Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit 9597abe0 authored Oct 04, 2012 by Andi Kleen Committed by Linus Torvalds Oct 06, 2012

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>

parent 3cf5ae6e

arch/powerpc/platforms/40x/ppc40x_simple.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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",

arch/powerpc/platforms/512x/mpc5121_generic.c

+1 −1

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

arch/powerpc/platforms/52xx/lite5200.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -172,7 +172,7 @@ static void __init lite5200_setup_arch(void)
		mpc52xx_setup_pci();
		}

		static const char *board[] __initdata = {
		static const char * const board[] __initconst = {
		"fsl,lite5200",
		"fsl,lite5200b",
		NULL,

arch/powerpc/platforms/52xx/media5200.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -232,7 +232,7 @@ static void __init media5200_setup_arch(void)
		}

		/* list of the supported boards */
		static const char *board[] __initdata = {
		static const char * const board[] __initconst = {
		"fsl,media5200",
		NULL
		};

arch/powerpc/platforms/83xx/mpc837x_rdb.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@ static void __init mpc837x_rdb_setup_arch(void)

		machine_device_initcall(mpc837x_rdb, mpc83xx_declare_of_platform_devices);

		static const char *board[] __initdata = {
		static const char * const board[] __initconst = {
		"fsl,mpc8377rdb",
		"fsl,mpc8378rdb",
		"fsl,mpc8379rdb",