summaryrefslogtreecommitdiff
path: root/arch/arm/mach-footbridge/ebsa285.c
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2011-10-24 23:02:37 +0400
committerRob Herring <rob.herring@calxeda.com>2011-10-24 23:02:37 +0400
commit3a8254364277fabe01bc0e12b9691722939f5ef3 (patch)
tree0befa43780509144cc840f767859006409e0506d /arch/arm/mach-footbridge/ebsa285.c
parent976d167615b64e14bc1491ca51d424e2ba9a5e84 (diff)
parent34471a9168c8bfd7f0d00989a7b0797ad27d585e (diff)
downloadlinux-3a8254364277fabe01bc0e12b9691722939f5ef3.tar.xz
Merge remote-tracking branch 'rmk/devel-stable' into HEAD
Diffstat (limited to 'arch/arm/mach-footbridge/ebsa285.c')
-rw-r--r--arch/arm/mach-footbridge/ebsa285.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-footbridge/ebsa285.c b/arch/arm/mach-footbridge/ebsa285.c
index 2ef69ff44ba8..012210cf7d16 100644
--- a/arch/arm/mach-footbridge/ebsa285.c
+++ b/arch/arm/mach-footbridge/ebsa285.c
@@ -15,7 +15,7 @@
MACHINE_START(EBSA285, "EBSA285")
/* Maintainer: Russell King */
- .boot_params = 0x00000100,
+ .atag_offset = 0x100,
.video_start = 0x000a0000,
.video_end = 0x000bffff,
.map_io = footbridge_map_io,