Merge branch 'master' into tk71

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

diff --git a/arch/arm/mach-sa1100/jornada720.c b/arch/arm/mach-sa1100/jornada720.c
index d3ec620618f1866edf026abecc2739865dd2ad24..491ac9f20fb48c27045ecfc87be3971cdf4a54e1 100644 (file)
--- a/arch/arm/mach-sa1100/jornada720.c
+++ b/arch/arm/mach-sa1100/jornada720.c
@@ -364,8 +364,6 @@ static void __init jornada720_mach_init(void)
 
 MACHINE_START(JORNADA720, "HP Jornada 720")
        /* Maintainer: Kristoffer Ericson <Kristoffer.Ericson@gmail.com> */
-       .phys_io        = 0x80000000,
-       .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
        .boot_params    = 0xc0000100,
        .map_io         = jornada720_map_io,
        .init_irq       = sa1100_init_irq,