debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

proper fix 

svn path=/dists/trunk/linux-2.6/; revision=5893
This commit is contained in:
Martin Michlmayr 2006-02-14 23:08:53 +00:00
parent ef6852e0e1
commit 41fcd05d85
1 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
debian/patches/arm-nslu2-fix-flash.patch vendored
View File

@ -1,16 +1,30 @@
## DP: Fix compilation error due to flash changes
## DP: Patch author: Alessandro Zummo <a.zummo@towertech.it>
## DP: Patch author: Martin Michlmayr <tbm@cyrius.com>
## DP: Upstream status: submitted
# Fixes build failure introduced by
# http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=54e269ead6e672325866037b0617a72edd1396b9
#
arch/arm/mach-ixp4xx/nslu2-setup.c | 2 --
1 file changed, 2 deletions(-)
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.
--- linux-nslu2.orig/arch/arm/mach-ixp4xx/nslu2-setup.c 2006-02-06 21:49:41.000000000 +0100
+++ linux-nslu2/arch/arm/mach-ixp4xx/nslu2-setup.c 2006-02-06 21:59:55.000000000 +0100
@@ -27,8 +27,6 @@ static struct flash_platform_data nslu2_
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(-)
--- a/arch/arm/mach-ixp4xx/nslu2-setup.c 2006-02-14 22:36:51.000000000 +0000
+++ b/arch/arm/mach-ixp4xx/nslu2-setup.c 2006-02-14 22:56:53.000000000 +0000
@@ -27,8 +27,6 @@
};
static struct resource nslu2_flash_resource = {
@ -19,3 +33,15 @@
.flags = IORESOURCE_MEM,
};
@@ -116,6 +114,10 @@
{
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));