aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-integrator/integrator_ap.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-02-14 09:05:40 -0500
committerArnd Bergmann <arnd@arndb.de>2013-02-14 09:05:40 -0500
commit7822eee1acbbea254212ad69ac99aae7986461da (patch)
treed7168d2e23130e3e6c36a731edc29eadd5128fc2 /arch/arm/mach-integrator/integrator_ap.c
parent0e55f0b0037c91bf269f7975ad353c31d8d12c32 (diff)
parent8c0c774dd7b4aa0e0b69f483a70c7f41995139ef (diff)
Merge branch 'warning-fixes' into next/fixes-non-critical
These are fixes for compiler warnings that for the most part were introduced during the 3.8 cycle but are otherwise harmless. * warning-fixes: scripts/sortextable: silence script output ARM: s3c: i2c: add platform_device forward declaration ARM: mvebu: allow selecting mvebu without Armada XP ARM: pick Versatile by default for !MMU ARM: integrator: fix build with INTEGRATOR_AP off ARM: integrator/versatile: fix NOMMU warnings ARM: sa1100: don't warn about mach/ide.h ARM: shmobile: fix defconfig warning on CONFIG_USB ARM: w90x900: fix legacy assembly syntax ARM: samsung: fix assembly syntax for new gas ARM: disable virt_to_bus/virt_to_bus almost everywhere Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-integrator/integrator_ap.c')
-rw-r--r--arch/arm/mach-integrator/integrator_ap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
index 26762bf41308..592c168f4b62 100644
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@ -94,7 +94,7 @@ void __iomem *ap_syscon_base;
94 * f1b00000 1b000000 GPIO 94 * f1b00000 1b000000 GPIO
95 */ 95 */
96 96
97static struct map_desc ap_io_desc[] __initdata = { 97static struct map_desc ap_io_desc[] __initdata __maybe_unused = {
98 { 98 {
99 .virtual = IO_ADDRESS(INTEGRATOR_HDR_BASE), 99 .virtual = IO_ADDRESS(INTEGRATOR_HDR_BASE),
100 .pfn = __phys_to_pfn(INTEGRATOR_HDR_BASE), 100 .pfn = __phys_to_pfn(INTEGRATOR_HDR_BASE),