1 files changed, 4 insertions, 9 deletions

diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c
index 3a22d84e1047..c2e105c89c95 100644
--- a/arch/arm/mach-ixp4xx/ixdp425-setup.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c
@@ -14,6 +14,7 @@
 #include <linux/serial.h>
 #include <linux/tty.h>
 #include <linux/serial_8250.h>
+#include <linux/slab.h>
 
 #include <asm/types.h>
 #include <asm/setup.h>
@@ -30,8 +31,6 @@ static struct flash_platform_data ixdp425_flash_data = {
 };
 
 static struct resource ixdp425_flash_resource = {
-        .start          = IXDP425_FLASH_BASE,
-        .end            = IXDP425_FLASH_BASE + IXDP425_FLASH_SIZE - 1,
         .flags          = IORESOURCE_MEM,
 };
 
@@ -108,17 +107,13 @@ static struct platform_device *ixdp425_devices[] __initdata = {
         &ixdp425_uart
 };
 
-
 static void __init ixdp425_init(void)
 {
         ixp4xx_sys_init();
 
-        /*
-         * IXP465 has 32MB window
-         */
-        if (machine_is_ixdp465()) {
-                ixdp425_flash_resource.end += IXDP425_FLASH_SIZE;
-        }
+        ixdp425_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
+        ixdp425_flash_resource.end =
+                IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1;
 
         platform_add_devices(ixdp425_devices, ARRAY_SIZE(ixdp425_devices));
 }