[kernel] r7955 - in dists/trunk/linux-2.6/debian: . patches/features/arm patches/series

[Martin Michlmayr]

Author: tbm
Date: Sat Dec  9 21:38:50 2006
New Revision: 7955

Added:
   dists/trunk/linux-2.6/debian/patches/features/arm/ixp4xx-net-build-fix.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
Log:
Add IXP4xx network build fix.


Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Sat Dec  9 21:38:50 2006
@@ -14,6 +14,9 @@
   [ Bastian Blank ]
   * Remove legacy pty support. (closes: #338404) 
 
+  [ Rod Whitby ]
+  * Add IXP4xx network build fix.
+
  -- Bastian Blank <waldi at debian.org>  Mon,  4 Dec 2006 07:16:41 +0100
 
 linux-2.6 (2.6.18-6) UNRELEASED; urgency=low

Added: dists/trunk/linux-2.6/debian/patches/features/arm/ixp4xx-net-build-fix.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/features/arm/ixp4xx-net-build-fix.patch	Sat Dec  9 21:38:50 2006
@@ -0,0 +1,30 @@
+---
+ arch/arm/mach-ixp4xx/common.c    |    1 -
+ drivers/net/ixp4xx/ixp4xx_qmgr.c |    2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+Index: linux-2.6.19/arch/arm/mach-ixp4xx/common.c
+===================================================================
+--- linux-2.6.19.orig/arch/arm/mach-ixp4xx/common.c
++++ linux-2.6.19/arch/arm/mach-ixp4xx/common.c
+@@ -13,7 +13,6 @@
+  * warranty of any kind, whether express or implied.
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/kernel.h>
+ #include <linux/mm.h>
+ #include <linux/init.h>
+Index: linux-2.6.19/drivers/net/ixp4xx/ixp4xx_qmgr.c
+===================================================================
+--- linux-2.6.19.orig/drivers/net/ixp4xx/ixp4xx_qmgr.c
++++ linux-2.6.19/drivers/net/ixp4xx/ixp4xx_qmgr.c
+@@ -165,7 +165,7 @@ int queue_set_irq_src(struct qm_queue *q
+ 	return 0;
+ }
+ 
+-static irqreturn_t irq_qm1(int irq, void *dev_id, struct pt_regs *regs)
++static irqreturn_t irq_qm1(int irq, void *dev_id)
+ {
+ 	struct qm_qmgr *qmgr = dev_id;
+ 	int offs, reg;

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Sat Dec  9 21:38:50 2006
@@ -28,6 +28,7 @@
 + features/arm/ixp4xx-0.2.1-driver.patch
 + features/arm/ixp4xx-net-driver-fix-qmgr.patch
 + features/arm/ixp4xx-net-driver-improve-mac-handling.patch
++ features/arm/ixp4xx-net-build-fix.patch
 + bugfix/mips/ide-scan.patch
 + bugfix/mips/64bit-tulip.patch
 + bugfix/mips/tulip_dc21143.patch