diff options
| author | Andi Kleen <ak@linux.intel.com> | 2012-10-04 20:11:28 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-05 14:04:38 -0400 |
| commit | bcad6dc3634a861c8c5e1f7261c02646a9010014 (patch) | |
| tree | b096db775bc6f14935fa2af0354bcf96ab700894 /arch/arm/mach-msm | |
| parent | 754b7b63d112ecc771e376388dcefd7b79bf5c4b (diff) | |
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.c | 4 |
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 @@ | |||
| 37 | #include "devices.h" | 37 | #include "devices.h" |
| 38 | #include "common.h" | 38 | #include "common.h" |
| 39 | 39 | ||
| 40 | static const resource_size_t qsd8x50_surf_smc91x_base __initdata = 0x70000300; | 40 | static const resource_size_t qsd8x50_surf_smc91x_base __initconst = 0x70000300; |
| 41 | static const unsigned qsd8x50_surf_smc91x_gpio __initdata = 156; | 41 | static const unsigned qsd8x50_surf_smc91x_gpio __initconst = 156; |
| 42 | 42 | ||
| 43 | /* Leave smc91x resources empty here, as we'll fill them in | 43 | /* Leave smc91x resources empty here, as we'll fill them in |
| 44 | * at run-time: they vary from board to board, and the true | 44 | * at run-time: they vary from board to board, and the true |