diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:23:28 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:23:28 -0400 |
commit | 929f58aeeb46f964d9468ce1addd993f5d92b11d (patch) | |
tree | 95355731bd4d21d221cdc2a5ab073244ff76db65 /arch/arm/mach-realview | |
parent | fcd467137ea2da46ffe5cbfdb42e8a2b35f13dad (diff) | |
parent | a26bce1220a4c5a7a074a779e6aad3cae63a94f7 (diff) |
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
Diffstat (limited to 'arch/arm/mach-realview')
-rw-r--r-- | arch/arm/mach-realview/realview_eb.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-realview/realview_pb1176.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-realview/realview_pb11mp.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-realview/realview_pba8.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-realview/realview_pbx.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c index 7a4e3b18cb3..026c66ad7ec 100644 --- a/arch/arm/mach-realview/realview_eb.c +++ b/arch/arm/mach-realview/realview_eb.c | |||
@@ -463,7 +463,7 @@ static void __init realview_eb_init(void) | |||
463 | 463 | ||
464 | MACHINE_START(REALVIEW_EB, "ARM-RealView EB") | 464 | MACHINE_START(REALVIEW_EB, "ARM-RealView EB") |
465 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ | 465 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ |
466 | .boot_params = PLAT_PHYS_OFFSET + 0x00000100, | 466 | .atag_offset = 0x100, |
467 | .fixup = realview_fixup, | 467 | .fixup = realview_fixup, |
468 | .map_io = realview_eb_map_io, | 468 | .map_io = realview_eb_map_io, |
469 | .init_early = realview_init_early, | 469 | .init_early = realview_init_early, |
diff --git a/arch/arm/mach-realview/realview_pb1176.c b/arch/arm/mach-realview/realview_pb1176.c index ad5671acb66..7263dea7777 100644 --- a/arch/arm/mach-realview/realview_pb1176.c +++ b/arch/arm/mach-realview/realview_pb1176.c | |||
@@ -358,7 +358,7 @@ static void __init realview_pb1176_init(void) | |||
358 | 358 | ||
359 | MACHINE_START(REALVIEW_PB1176, "ARM-RealView PB1176") | 359 | MACHINE_START(REALVIEW_PB1176, "ARM-RealView PB1176") |
360 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ | 360 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ |
361 | .boot_params = PLAT_PHYS_OFFSET + 0x00000100, | 361 | .atag_offset = 0x100, |
362 | .fixup = realview_pb1176_fixup, | 362 | .fixup = realview_pb1176_fixup, |
363 | .map_io = realview_pb1176_map_io, | 363 | .map_io = realview_pb1176_map_io, |
364 | .init_early = realview_init_early, | 364 | .init_early = realview_init_early, |
diff --git a/arch/arm/mach-realview/realview_pb11mp.c b/arch/arm/mach-realview/realview_pb11mp.c index b43644b3685..671ad6d6ff0 100644 --- a/arch/arm/mach-realview/realview_pb11mp.c +++ b/arch/arm/mach-realview/realview_pb11mp.c | |||
@@ -360,7 +360,7 @@ static void __init realview_pb11mp_init(void) | |||
360 | 360 | ||
361 | MACHINE_START(REALVIEW_PB11MP, "ARM-RealView PB11MPCore") | 361 | MACHINE_START(REALVIEW_PB11MP, "ARM-RealView PB11MPCore") |
362 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ | 362 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ |
363 | .boot_params = PLAT_PHYS_OFFSET + 0x00000100, | 363 | .atag_offset = 0x100, |
364 | .fixup = realview_fixup, | 364 | .fixup = realview_fixup, |
365 | .map_io = realview_pb11mp_map_io, | 365 | .map_io = realview_pb11mp_map_io, |
366 | .init_early = realview_init_early, | 366 | .init_early = realview_init_early, |
diff --git a/arch/arm/mach-realview/realview_pba8.c b/arch/arm/mach-realview/realview_pba8.c index 763e8f38c15..cbf22df4ad5 100644 --- a/arch/arm/mach-realview/realview_pba8.c +++ b/arch/arm/mach-realview/realview_pba8.c | |||
@@ -310,7 +310,7 @@ static void __init realview_pba8_init(void) | |||
310 | 310 | ||
311 | MACHINE_START(REALVIEW_PBA8, "ARM-RealView PB-A8") | 311 | MACHINE_START(REALVIEW_PBA8, "ARM-RealView PB-A8") |
312 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ | 312 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ |
313 | .boot_params = PLAT_PHYS_OFFSET + 0x00000100, | 313 | .atag_offset = 0x100, |
314 | .fixup = realview_fixup, | 314 | .fixup = realview_fixup, |
315 | .map_io = realview_pba8_map_io, | 315 | .map_io = realview_pba8_map_io, |
316 | .init_early = realview_init_early, | 316 | .init_early = realview_init_early, |
diff --git a/arch/arm/mach-realview/realview_pbx.c b/arch/arm/mach-realview/realview_pbx.c index 363b0ab5615..8ec7e52618b 100644 --- a/arch/arm/mach-realview/realview_pbx.c +++ b/arch/arm/mach-realview/realview_pbx.c | |||
@@ -393,7 +393,7 @@ static void __init realview_pbx_init(void) | |||
393 | 393 | ||
394 | MACHINE_START(REALVIEW_PBX, "ARM-RealView PBX") | 394 | MACHINE_START(REALVIEW_PBX, "ARM-RealView PBX") |
395 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ | 395 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ |
396 | .boot_params = PLAT_PHYS_OFFSET + 0x00000100, | 396 | .atag_offset = 0x100, |
397 | .fixup = realview_pbx_fixup, | 397 | .fixup = realview_pbx_fixup, |
398 | .map_io = realview_pbx_map_io, | 398 | .map_io = realview_pbx_map_io, |
399 | .init_early = realview_init_early, | 399 | .init_early = realview_init_early, |