[kernel] r6518 - in dists/trunk/linux-2.6/debian/patches: series

[Bastian Blank]

Author: waldi
Date: Mon May  1 20:57:38 2006
New Revision: 6518

Added:
   dists/trunk/linux-2.6/debian/patches/s390-drivers-qeth.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/series/0experimental.1

Log:
* debian/patches/series/0experimental.1: Add s390-drivers-qeth.patch.
* debian/patches/s390-drivers-qeth.patch: Add.


Added: dists/trunk/linux-2.6/debian/patches/s390-drivers-qeth.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/s390-drivers-qeth.patch	Mon May  1 20:57:38 2006
@@ -0,0 +1,28 @@
+
+From: Bastian Blank <bastian at waldi.eu.org>
+
+Signed-off-by: Bastian Blank <bastian at waldi.eu.org>
+Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
+Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
+Cc: "David S. Miller" <davem at davemloft.net>
+Cc: Jeff Garzik <jeff at garzik.org>
+Acked-by: Frank Pavlic <fpavlic at de.ibm.com>
+Signed-off-by: Andrew Morton <akpm at 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,
+_
+

Modified: dists/trunk/linux-2.6/debian/patches/series/0experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/0experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/0experimental.1	Mon May  1 20:57:38 2006
@@ -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