5 files changed, 6 insertions, 6 deletions

diff --git a/arch/arm/mach-footbridge/cats-hw.c b/arch/arm/mach-footbridge/cats-hw.c
index 206ff2f39d6c..d5f178540928 100644
--- a/arch/arm/mach-footbridge/cats-hw.c
+++ b/arch/arm/mach-footbridge/cats-hw.c
@@ -85,7 +85,7 @@ fixup_cats(struct tag *tags, char **cmdline, struct meminfo *mi)
 
 MACHINE_START(CATS, "Chalice-CATS")
         /* Maintainer: Philip Blundell */
-        .boot_params    = 0x00000100,
+        .atag_offset    = 0x100,
         .soft_reboot    = 1,
         .fixup          = fixup_cats,
         .map_io         = footbridge_map_io,
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,
diff --git a/arch/arm/mach-footbridge/include/mach/debug-macro.S b/arch/arm/mach-footbridge/include/mach/debug-macro.S
index 1be2eeb7a0a0..e5acde25ffc5 100644
--- a/arch/arm/mach-footbridge/include/mach/debug-macro.S
+++ b/arch/arm/mach-footbridge/include/mach/debug-macro.S
@@ -15,7 +15,7 @@
 
 #ifndef CONFIG_DEBUG_DC21285_PORT
         /* For NetWinder debugging */
-                .macro  addruart, rp, rv
+                .macro  addruart, rp, rv, tmp
                 mov     \rp, #0x000003f8
                 orr     \rv, \rp, #0xff000000   @ virtual
                 orr     \rp, \rp, #0x7c000000   @ physical
@@ -31,7 +31,7 @@
                 .equ    dc21285_high, ARMCSR_BASE & 0xff000000
                 .equ    dc21285_low,  ARMCSR_BASE & 0x00ffffff
 
-                .macro  addruart, rp, rv
+                .macro  addruart, rp, rv, tmp
                 .if     dc21285_low
                 mov     \rp, #dc21285_low
                 .else
diff --git a/arch/arm/mach-footbridge/netwinder-hw.c b/arch/arm/mach-footbridge/netwinder-hw.c
index 0f7aeff486c9..0d3846f3b60d 100644
--- a/arch/arm/mach-footbridge/netwinder-hw.c
+++ b/arch/arm/mach-footbridge/netwinder-hw.c
@@ -647,7 +647,7 @@ fixup_netwinder(struct tag *tags, char **cmdline, struct meminfo *mi)
 
 MACHINE_START(NETWINDER, "Rebel-NetWinder")
         /* Maintainer: Russell King/Rebel.com */
-        .boot_params    = 0x00000100,
+        .atag_offset    = 0x100,
         .video_start    = 0x000a0000,
         .video_end      = 0x000bffff,
         .reserve_lp0    = 1,
diff --git a/arch/arm/mach-footbridge/personal.c b/arch/arm/mach-footbridge/personal.c
index 3285e91ca8c1..f41dba39b327 100644
--- a/arch/arm/mach-footbridge/personal.c
+++ b/arch/arm/mach-footbridge/personal.c
@@ -15,7 +15,7 @@
 
 MACHINE_START(PERSONAL_SERVER, "Compaq-PersonalServer")
         /* Maintainer: Jamey Hicks / George France */
-        .boot_params    = 0x00000100,
+        .atag_offset    = 0x100,
         .map_io         = footbridge_map_io,
         .init_irq       = footbridge_init_irq,
         .timer          = &footbridge_timer,