Merge branch 'master' into csb1725

[mv-sheeva.git] / arch / arm / mach-ixp2000 / ixdp2800.c

diff --git a/arch/arm/mach-ixp2000/ixdp2800.c b/arch/arm/mach-ixp2000/ixdp2800.c
index 237b61a85e9a397f6d398c53a686edbd186515ac..cd4c9bcff2b512f9571af54f3734a2b790bae614 100644 (file)
--- a/arch/arm/mach-ixp2000/ixdp2800.c
+++ b/arch/arm/mach-ixp2000/ixdp2800.c
@@ -285,8 +285,6 @@ void __init ixdp2800_init_irq(void)
 
 MACHINE_START(IXDP2800, "Intel IXDP2800 Development Platform")
        /* Maintainer: MontaVista Software, Inc. */
-       .phys_io        = IXP2000_UART_PHYS_BASE,
-       .io_pg_offst    = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
        .boot_params    = 0x00000100,
        .map_io         = ixdp2x00_map_io,
        .init_irq       = ixdp2800_init_irq,