diff options
| author | Andi Kleen <ak@linux.intel.com> | 2012-10-04 17:11:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-06 03:04:39 +0900 |
| commit | 9597abe00c1bab2aedce6b49866bf6d1e81c9eed (patch) | |
| tree | a0a99118c3d827ca37971f54e437d84a1113061d /arch/powerpc/platforms/52xx | |
| parent | 3cf5ae6e64507541ce00893e6459da3ef3d4fd6b (diff) | |
| download | blackbird-op-linux-9597abe00c1bab2aedce6b49866bf6d1e81c9eed.tar.gz blackbird-op-linux-9597abe00c1bab2aedce6b49866bf6d1e81c9eed.zip | |
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/52xx')
| -rw-r--r-- | arch/powerpc/platforms/52xx/lite5200.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/52xx/media5200.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/52xx/lite5200.c b/arch/powerpc/platforms/52xx/lite5200.c index 01ffa64d2aa7..448d862bcf3d 100644 --- a/arch/powerpc/platforms/52xx/lite5200.c +++ b/arch/powerpc/platforms/52xx/lite5200.c @@ -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, diff --git a/arch/powerpc/platforms/52xx/media5200.c b/arch/powerpc/platforms/52xx/media5200.c index 17d91b7da315..070d315dd6cd 100644 --- a/arch/powerpc/platforms/52xx/media5200.c +++ b/arch/powerpc/platforms/52xx/media5200.c @@ -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 }; |
