diff options
author | Martin Michlmayr <tbm@cyrius.com> | 2006-02-16 17:36:12 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-02-16 17:36:12 -0500 |
commit | 3dfaf7a68e275a1a6bee4861fdd61f911e6eb7a2 (patch) | |
tree | 651a4d79de5e7032928290f103fd5d1ab4dc6d00 /arch/arm/mach-ixp4xx | |
parent | 7bbb79403163e047c6e333ff169db34e3c969e65 (diff) |
[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>
Diffstat (limited to 'arch/arm/mach-ixp4xx')
-rw-r--r-- | arch/arm/mach-ixp4xx/nslu2-setup.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-ixp4xx/nslu2-setup.c b/arch/arm/mach-ixp4xx/nslu2-setup.c index da9340a53434..f260a9d34f70 100644 --- a/arch/arm/mach-ixp4xx/nslu2-setup.c +++ b/arch/arm/mach-ixp4xx/nslu2-setup.c | |||
@@ -27,8 +27,6 @@ static struct flash_platform_data nslu2_flash_data = { | |||
27 | }; | 27 | }; |
28 | 28 | ||
29 | static struct resource nslu2_flash_resource = { | 29 | static struct resource nslu2_flash_resource = { |
30 | .start = NSLU2_FLASH_BASE, | ||
31 | .end = NSLU2_FLASH_BASE + NSLU2_FLASH_SIZE, | ||
32 | .flags = IORESOURCE_MEM, | 30 | .flags = IORESOURCE_MEM, |
33 | }; | 31 | }; |
34 | 32 | ||
@@ -116,6 +114,10 @@ static void __init nslu2_init(void) | |||
116 | { | 114 | { |
117 | ixp4xx_sys_init(); | 115 | ixp4xx_sys_init(); |
118 | 116 | ||
117 | nslu2_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); | ||
118 | nslu2_flash_resource.end = | ||
119 | IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1; | ||
120 | |||
119 | pm_power_off = nslu2_power_off; | 121 | pm_power_off = nslu2_power_off; |
120 | 122 | ||
121 | platform_add_devices(nslu2_devices, ARRAY_SIZE(nslu2_devices)); | 123 | platform_add_devices(nslu2_devices, ARRAY_SIZE(nslu2_devices)); |