Commit 3dfaf7a6 authored Feb 16, 2006 by Martin Michlmayr Committed by Russell King Feb 16, 2006

[ARM] 3337/1: Fix NSLU2 flash support according to window size configuration patch



Patch from Martin Michlmayr

ARM patch 3226/1 (IXP4xx runtime expansion bus window size configuration)
forgot to update mach-ixp4xx/nslu2-setup.c which leads to the following
compilation error.  Update NSLU2 flash support following patch 3226/1.

  CC      arch/arm/mach-ixp4xx/nslu2-setup.o
arch/arm/mach-ixp4xx/nslu2-setup.c:30: error: NSLU2_FLASH_BASE undeclared here (not in a function)
arch/arm/mach-ixp4xx/nslu2-setup.c:31: error: NSLU2_FLASH_SIZE undeclared here (not in a function)
make[1]: *** [arch/arm/mach-ixp4xx/nslu2-setup.o] Error 1
make: *** [arch/arm/mach-ixp4xx] Error 2

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>

---

 nslu2-setup.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent 7bbb7940

arch/arm/mach-ixp4xx/nslu2-setup.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -27,8 +27,6 @@ static struct flash_platform_data nslu2_flash_data = {
		};

		static struct resource nslu2_flash_resource = {
		.start = NSLU2_FLASH_BASE,
		.end = NSLU2_FLASH_BASE + NSLU2_FLASH_SIZE,
		.flags = IORESOURCE_MEM,
		};

		@@ -116,6 +114,10 @@ static void __init nslu2_init(void)
		{
		ixp4xx_sys_init();

		nslu2_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
		nslu2_flash_resource.end =
		IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1;

		pm_power_off = nslu2_power_off;

		platform_add_devices(nslu2_devices, ARRAY_SIZE(nslu2_devices));