summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-msm
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2012-10-05 02:11:28 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-05 20:04:38 +0200
commitbcad6dc3634a861c8c5e1f7261c02646a9010014 (patch)
treeb096db775bc6f14935fa2af0354bcf96ab700894 /arch/arm/mach-msm
parentsections: disable const sections for PA-RISC v2 (diff)
downloadlinux-bcad6dc3634a861c8c5e1f7261c02646a9010014.tar.xz
linux-bcad6dc3634a861c8c5e1f7261c02646a9010014.zip
sections: fix section conflicts in arch/arm/
Signed-off-by: Andi Kleen <ak@linux.intel.com> Cc: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/arm/mach-msm')
-rw-r--r--arch/arm/mach-msm/board-qsd8x50.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-msm/board-qsd8x50.c b/arch/arm/mach-msm/board-qsd8x50.c
index a344a373928b..2448fcf09eb1 100644
--- a/arch/arm/mach-msm/board-qsd8x50.c
+++ b/arch/arm/mach-msm/board-qsd8x50.c
@@ -37,8 +37,8 @@
#include "devices.h"
#include "common.h"
-static const resource_size_t qsd8x50_surf_smc91x_base __initdata = 0x70000300;
-static const unsigned qsd8x50_surf_smc91x_gpio __initdata = 156;
+static const resource_size_t qsd8x50_surf_smc91x_base __initconst = 0x70000300;
+static const unsigned qsd8x50_surf_smc91x_gpio __initconst = 156;
/* Leave smc91x resources empty here, as we'll fill them in
* at run-time: they vary from board to board, and the true