Merge branch 'master' into csb1725

[mv-sheeva.git] / arch / arm / mach-sa1100 / h3100.c

diff --git a/arch/arm/mach-sa1100/h3100.c b/arch/arm/mach-sa1100/h3100.c
index 0c7cea0dc01314381137ed85070c5e678371bba2..03d7376cf8a0a57e50dca58bc56d68d7868713e8 100644 (file)
--- a/arch/arm/mach-sa1100/h3100.c
+++ b/arch/arm/mach-sa1100/h3100.c
@@ -84,8 +84,6 @@ static void __init h3100_mach_init(void)
 }
 
 MACHINE_START(H3100, "Compaq iPAQ H3100")
-       .phys_io        = 0x80000000,
-       .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
        .boot_params    = 0xc0000100,
        .map_io         = h3100_map_io,
        .init_irq       = sa1100_init_irq,