Merge with /home/tmlind/src/kernel/linux-2.6

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap1 / board-perseus2.c

diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c
index 41a72da4b33e7db2279ffc93359539f4777bed06..8c211f93b401a1c964b895e5c397eba53a5a8c58 100644 (file)
--- a/arch/arm/mach-omap1/board-perseus2.c
+++ b/arch/arm/mach-omap1/board-perseus2.c
@@ -220,7 +220,7 @@ static void __init omap_perseus2_map_io(void)
        omap_writel(0x00000088, OMAP730_FLASH_ACFG_0);
 
        /*
-        * Ethernet support trough the debug board
+        * Ethernet support through the debug board
         * CS1 timings setup
         */
        omap_writel(0x0000fff3, OMAP730_FLASH_CFG_1);
@@ -235,7 +235,6 @@ static void __init omap_perseus2_map_io(void)
 
 MACHINE_START(OMAP_PERSEUS2, "OMAP730 Perseus2")
        /* Maintainer: Kevin Hilman <kjh@hilman.org> */
-       .phys_ram       = 0x10000000,
        .phys_io        = 0xfff00000,
        .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
        .boot_params    = 0x10000100,