6 files changed, 9 insertions, 9 deletions

diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 35b7273cfd..c9b69771f9 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -737,8 +737,8 @@ void __init setup_arch(char **cmdline_p)
         if (mdesc->soft_reboot)
                 reboot_setup("s");
 
-        if (mdesc->param_offset)
-                tags = phys_to_virt(mdesc->param_offset);
+        if (mdesc->boot_params)
+                tags = phys_to_virt(mdesc->boot_params);
 
         /*
          * If we have the old style parameters, convert them to
diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c
index 276431bf1c..86b862f56e 100644
--- a/arch/arm/mach-pxa/corgi.c
+++ b/arch/arm/mach-pxa/corgi.c
@@ -289,7 +289,7 @@ static void __init corgi_map_io(void)
 MACHINE_START(CORGI, "SHARP Corgi")
         .phys_ram       = 0xa0000000,
         .phys_io        = 0x40000000,
-        .io_pg_offst    = ((io_p2v(0x40000000) >> 18) & 0xfffc,)
+        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
         .fixup          = fixup_corgi,
         .map_io         = corgi_map_io,
         .init_irq       = corgi_init_irq,
@@ -302,7 +302,7 @@ MACHINE_END
 MACHINE_START(SHEPHERD, "SHARP Shepherd")
         .phys_ram       = 0xa0000000,
         .phys_io        = 0x40000000,
-        .io_pg_offst    = ((io_p2v(0x40000000) >> 18) & 0xfffc,)
+        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
         .fixup          = fixup_corgi,
         .map_io         = corgi_map_io,
         .init_irq       = corgi_init_irq,
@@ -315,7 +315,7 @@ MACHINE_END
 MACHINE_START(HUSKY, "SHARP Husky")
         .phys_ram       = 0xa0000000,
         .phys_io        = 0x40000000,
-        .io_pg_offst    = ((io_p2v(0x40000000) >> 18) & 0xfffc,)
+        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
         .fixup          = fixup_corgi,
         .map_io         = corgi_map_io,
         .init_irq       = corgi_init_irq,
diff --git a/arch/arm/mach-pxa/idp.c b/arch/arm/mach-pxa/idp.c
index f82f5aad56..386e107b53 100644
--- a/arch/arm/mach-pxa/idp.c
+++ b/arch/arm/mach-pxa/idp.c
@@ -184,7 +184,7 @@ MACHINE_START(PXA_IDP, "Vibren PXA255 IDP")
         /* Maintainer: Vibren Technologies */
         .phys_ram       = 0xa0000000,
         .phys_io        = 0x40000000,
-        .io_pg_offst    = ((io_p2v(0x40000000) >> 18) & 0xfffc,)
+        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
         .map_io         = idp_map_io,
         .init_irq       = idp_init_irq,
         .timer          = &pxa_timer,
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c
index e30b7c6227..6309853b59 100644
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
@@ -271,7 +271,7 @@ MACHINE_START(LUBBOCK, "Intel DBPXA250 Development Platform (aka Lubbock)")
         /* Maintainer: MontaVista Software Inc. */
         .phys_ram       = 0xa0000000,
         .phys_io        = 0x40000000,
-        .io_pg_offst    = ((io_p2v(0x40000000) >> 18) & 0xfffc,)
+        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
         .map_io         = lubbock_map_io,
         .init_irq       = lubbock_init_irq,
         .timer          = &pxa_timer,
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c
index 5d2f76b6df..827b7b5a5b 100644
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
@@ -348,7 +348,7 @@ MACHINE_START(MAINSTONE, "Intel HCDDBBVA0 Development Platform (aka Mainstone)")
         /* Maintainer: MontaVista Software Inc. */
         .phys_ram       = 0xa0000000,
         .phys_io        = 0x40000000,
-        .io_pg_offst    = ((io_p2v(0x40000000) >> 18) & 0xfffc,)
+        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
         .map_io         = mainstone_map_io,
         .init_irq       = mainstone_init_irq,
         .timer          = &pxa_timer,
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c
index ebae969e88..0e4f6fab10 100644
--- a/arch/arm/mach-pxa/poodle.c
+++ b/arch/arm/mach-pxa/poodle.c
@@ -182,7 +182,7 @@ static void __init poodle_map_io(void)
 MACHINE_START(POODLE, "SHARP Poodle")
         .phys_ram       = 0xa0000000,
         .phys_io        = 0x40000000,
-        .io_pg_offst    = ((io_p2v(0x40000000) >> 18) & 0xfffc,)
+        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
         .fixup          = fixup_poodle,
         .map_io         = poodle_map_io,
         .init_irq       = pxa_init_irq,