[kernel] r5893 - dists/trunk/linux-2.6/debian/patches

[Martin Michlmayr]

Author: tbm
Date: Tue Feb 14 23:08:53 2006
New Revision: 5893

Modified:
   dists/trunk/linux-2.6/debian/patches/arm-nslu2-fix-flash.patch
Log:
proper fix


Modified: dists/trunk/linux-2.6/debian/patches/arm-nslu2-fix-flash.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/arm-nslu2-fix-flash.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/arm-nslu2-fix-flash.patch	Tue Feb 14 23:08:53 2006
@@ -1,16 +1,30 @@
 ## DP: Fix compilation error due to flash changes
-## DP: Patch author: Alessandro Zummo <a.zummo at towertech.it>
+## DP: Patch author: Martin Michlmayr <tbm at 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 at 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));
+