From 7fe9569b072d22c8efb9c7ef8d45a5f4034ad205 Mon Sep 17 00:00:00 2001
From: Martin Michlmayr <tbm@cyrius.com>
Date: Sat, 9 Dec 2006 20:38:50 +0000
Subject: [PATCH] Add IXP4xx network build fix.

svn path=/dists/trunk/linux-2.6/; revision=7955
---
 debian/changelog                              |  3 ++
 .../features/arm/ixp4xx-net-build-fix.patch   | 30 +++++++++++++++++++
 debian/patches/series/1~experimental.1        |  1 +
 3 files changed, 34 insertions(+)
 create mode 100644 debian/patches/features/arm/ixp4xx-net-build-fix.patch

diff --git a/debian/changelog b/debian/changelog
index 24623e2f5..dbd5316cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,9 @@ linux-2.6 (2.6.19-1~experimental.1) UNRELEASED; urgency=low
   [ Bastian Blank ]
   * Remove legacy pty support. (closes: #338404) 
 
+  [ Rod Whitby ]
+  * Add IXP4xx network build fix.
+
  -- Bastian Blank <waldi@debian.org>  Mon,  4 Dec 2006 07:16:41 +0100
 
 linux-2.6 (2.6.18-6) UNRELEASED; urgency=low
diff --git a/debian/patches/features/arm/ixp4xx-net-build-fix.patch b/debian/patches/features/arm/ixp4xx-net-build-fix.patch
new file mode 100644
index 000000000..58e042765
--- /dev/null
+++ b/debian/patches/features/arm/ixp4xx-net-build-fix.patch
@@ -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;
diff --git a/debian/patches/series/1~experimental.1 b/debian/patches/series/1~experimental.1
index 67ad24768..35891dc2b 100644
--- a/debian/patches/series/1~experimental.1
+++ b/debian/patches/series/1~experimental.1
@@ -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