Merge branch 'master' into csb1725

[mv-sheeva.git] / arch / arm / mach-ks8695 / board-dsm320.c

diff --git a/arch/arm/mach-ks8695/board-dsm320.c b/arch/arm/mach-ks8695/board-dsm320.c
index 521ff0789f398eb641d3c8907fe55e1054ed66da..ada92b6bed24793aa2485ead10b1f03f03e19b63 100644 (file)
--- a/arch/arm/mach-ks8695/board-dsm320.c
+++ b/arch/arm/mach-ks8695/board-dsm320.c
@@ -121,8 +121,6 @@ static void __init dsm320_init(void)
 
 MACHINE_START(DSM320, "D-Link DSM-320 Wireless Media Player")
        /* Maintainer: Simtec Electronics. */
-       .phys_io        = KS8695_IO_PA,
-       .io_pg_offst    = (KS8695_IO_VA >> 18) & 0xfffc,
        .boot_params    = KS8695_SDRAM_PA + 0x100,
        .map_io         = ks8695_map_io,
        .init_irq       = ks8695_init_irq,