aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-u300/u300.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2011-11-29 08:51:15 -0500
committerLinus Walleij <linus.walleij@linaro.org>2011-12-18 18:35:33 -0500
commitbfd912c0dd119d98923494d0cbeee571df756b8a (patch)
tree76f1fb112547f0fb31a42a777ebe0126f5cd7e74 /arch/arm/mach-u300/u300.c
parent5611cc4572e889b62a7b4c72a413536bf6a9c416 (diff)
ARM: u300: delete memory.h
Last merge window the memory maps for U300 were simplified so we can now safely delete memory.h. Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-u300/u300.c')
-rw-r--r--arch/arm/mach-u300/u300.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-u300/u300.c b/arch/arm/mach-u300/u300.c
index 89422ee7f3a8..b200312345c5 100644
--- a/arch/arm/mach-u300/u300.c
+++ b/arch/arm/mach-u300/u300.c
@@ -46,7 +46,7 @@ static void __init u300_init_machine(void)
46 46
47MACHINE_START(U300, MACH_U300_STRING) 47MACHINE_START(U300, MACH_U300_STRING)
48 /* Maintainer: Linus Walleij <linus.walleij@stericsson.com> */ 48 /* Maintainer: Linus Walleij <linus.walleij@stericsson.com> */
49 .atag_offset = BOOT_PARAMS_OFFSET, 49 .atag_offset = 0x100,
50 .map_io = u300_map_io, 50 .map_io = u300_map_io,
51 .init_irq = u300_init_irq, 51 .init_irq = u300_init_irq,
52 .timer = &u300_timer, 52 .timer = &u300_timer,