Merge branch 'master' into csb1725

[mv-sheeva.git] / arch / arm / mach-pxa / h5000.c

diff --git a/arch/arm/mach-pxa/h5000.c b/arch/arm/mach-pxa/h5000.c
index c1cab0871c996de961920257a3f5140f2af98a0e..7057a1f46db4ed9a35094563216137c80708ade4 100644 (file)
--- a/arch/arm/mach-pxa/h5000.c
+++ b/arch/arm/mach-pxa/h5000.c
@@ -201,8 +201,6 @@ static void __init h5000_init(void)
 }
 
 MACHINE_START(H5400, "HP iPAQ H5000")
-       .phys_io = 0x40000000,
-       .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
        .boot_params = 0xa0000100,
        .map_io = pxa_map_io,
        .init_irq = pxa25x_init_irq,