aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBastian Blank <waldi@debian.org>2006-05-01 20:57:38 +0000
committerBastian Blank <waldi@debian.org>2006-05-01 20:57:38 +0000
commit845d0c7e884ef39639b8f1a920a6d7f9be2c7a84 (patch)
tree3026f82b1301fee9f43af900094ec2b06e2a60c7
parent8d89fc3f6da5ad76079d6a972986379db242ae65 (diff)
downloadkernel_replicant_linux-845d0c7e884ef39639b8f1a920a6d7f9be2c7a84.tar.gz
kernel_replicant_linux-845d0c7e884ef39639b8f1a920a6d7f9be2c7a84.tar.bz2
kernel_replicant_linux-845d0c7e884ef39639b8f1a920a6d7f9be2c7a84.zip
* debian/patches/series/0experimental.1: Add s390-drivers-qeth.patch.
* debian/patches/s390-drivers-qeth.patch: Add. svn path=/dists/trunk/linux-2.6/; revision=6518
-rw-r--r--debian/patches/s390-drivers-qeth.patch28
-rw-r--r--debian/patches/series/0experimental.11
2 files changed, 29 insertions, 0 deletions
diff --git a/debian/patches/s390-drivers-qeth.patch b/debian/patches/s390-drivers-qeth.patch
new file mode 100644
index 000000000000..5a4cc9e3378d
--- /dev/null
+++ b/debian/patches/s390-drivers-qeth.patch
@@ -0,0 +1,28 @@
+
+From: Bastian Blank <bastian@waldi.eu.org>
+
+Signed-off-by: Bastian Blank <bastian@waldi.eu.org>
+Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
+Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
+Cc: "David S. Miller" <davem@davemloft.net>
+Cc: Jeff Garzik <jeff@garzik.org>
+Acked-by: Frank Pavlic <fpavlic@de.ibm.com>
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+---
+
+ drivers/s390/net/qeth_main.c | 1 -
+ 1 files changed, 1 deletion(-)
+
+diff -puN drivers/s390/net/qeth_main.c~s390-make-qeth-buildable drivers/s390/net/qeth_main.c
+--- devel/drivers/s390/net/qeth_main.c~s390-make-qeth-buildable 2006-05-01 12:15:28.000000000 -0700
++++ devel-akpm/drivers/s390/net/qeth_main.c 2006-05-01 12:15:28.000000000 -0700
+@@ -8014,7 +8014,6 @@ static int (*qeth_old_arp_constructor) (
+
+ static struct neigh_ops arp_direct_ops_template = {
+ .family = AF_INET,
+- .destructor = NULL,
+ .solicit = NULL,
+ .error_report = NULL,
+ .output = dev_queue_xmit,
+_
+
diff --git a/debian/patches/series/0experimental.1 b/debian/patches/series/0experimental.1
index 6d3fedc1f10a..48616c4be20d 100644
--- a/debian/patches/series/0experimental.1
+++ b/debian/patches/series/0experimental.1
@@ -24,3 +24,4 @@
+ s390-drivers-ccw-uevent-cleanup.patch
+ mips-sb1-duart-tts.patch
#FIXME + powerpc-mkvmlinuz-support-2.patch
++ s390-drivers-qeth.patch