aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-08 15:07:42 -0400
committerArnd Bergmann <arnd@arndb.de>2011-10-08 15:07:42 -0400
commit71f2c153755442c05d15cd025484f676a5f3541f (patch)
treefe48af6ddc33da7a0aaf1a16ed9feeafa4a8e1e1 /arch/arm/mach-ux500
parent8efc59ad6764ade520012cb192cd484e5191cd9c (diff)
parentc825dda905bac330c2da7fabdf5c0ac28758b3cd (diff)
Merge branch 'depends/rmk/devel-stable' into next/cleanup
Diffstat (limited to 'arch/arm/mach-ux500')
-rw-r--r--arch/arm/mach-ux500/board-mop500.c6
-rw-r--r--arch/arm/mach-ux500/board-u5500.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 6c00d4920396..4810968b672c 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -689,7 +689,7 @@ static void __init hrefv60_init_machine(void)
689 689
690MACHINE_START(U8500, "ST-Ericsson MOP500 platform") 690MACHINE_START(U8500, "ST-Ericsson MOP500 platform")
691 /* Maintainer: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com> */ 691 /* Maintainer: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com> */
692 .boot_params = 0x100, 692 .atag_offset = 0x100,
693 .map_io = u8500_map_io, 693 .map_io = u8500_map_io,
694 .init_irq = ux500_init_irq, 694 .init_irq = ux500_init_irq,
695 /* we re-use nomadik timer here */ 695 /* we re-use nomadik timer here */
@@ -698,7 +698,7 @@ MACHINE_START(U8500, "ST-Ericsson MOP500 platform")
698MACHINE_END 698MACHINE_END
699 699
700MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+") 700MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+")
701 .boot_params = 0x100, 701 .atag_offset = 0x100,
702 .map_io = u8500_map_io, 702 .map_io = u8500_map_io,
703 .init_irq = ux500_init_irq, 703 .init_irq = ux500_init_irq,
704 .timer = &ux500_timer, 704 .timer = &ux500_timer,
@@ -706,7 +706,7 @@ MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+")
706MACHINE_END 706MACHINE_END
707 707
708MACHINE_START(SNOWBALL, "Calao Systems Snowball platform") 708MACHINE_START(SNOWBALL, "Calao Systems Snowball platform")
709 .boot_params = 0x100, 709 .atag_offset = 0x100,
710 .map_io = u8500_map_io, 710 .map_io = u8500_map_io,
711 .init_irq = ux500_init_irq, 711 .init_irq = ux500_init_irq,
712 /* we re-use nomadik timer here */ 712 /* we re-use nomadik timer here */
diff --git a/arch/arm/mach-ux500/board-u5500.c b/arch/arm/mach-ux500/board-u5500.c
index e58f0f562426..166d47a5f4f3 100644
--- a/arch/arm/mach-ux500/board-u5500.c
+++ b/arch/arm/mach-ux500/board-u5500.c
@@ -118,7 +118,7 @@ static void __init u5500_init_machine(void)
118} 118}
119 119
120MACHINE_START(U5500, "ST-Ericsson U5500 Platform") 120MACHINE_START(U5500, "ST-Ericsson U5500 Platform")
121 .boot_params = 0x00000100, 121 .atag_offset = 0x100,
122 .map_io = u5500_map_io, 122 .map_io = u5500_map_io,
123 .init_irq = ux500_init_irq, 123 .init_irq = ux500_init_irq,
124 .timer = &ux500_timer, 124 .timer = &ux500_timer,