Merge branch 'master' into csb1725

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

diff --git a/arch/arm/mach-sa1100/cerf.c b/arch/arm/mach-sa1100/cerf.c
index bc950ef418af35a534bf01900482d68b8232ddf1..98d780608c7e98ffb3a64fb285301cc88731a6b5 100644 (file)
--- a/arch/arm/mach-sa1100/cerf.c
+++ b/arch/arm/mach-sa1100/cerf.c
@@ -135,8 +135,6 @@ static void __init cerf_init(void)
 
 MACHINE_START(CERF, "Intrinsyc CerfBoard/CerfCube")
        /* Maintainer: support@intrinsyc.com */
-       .phys_io        = 0x80000000,
-       .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
        .map_io         = cerf_map_io,
        .init_irq       = cerf_init_irq,
        .timer          = &sa1100_timer,