summaryrefslogtreecommitdiffstats
path: root/drivers/s390/net/qeth_main.c
diff options
context:
space:
mode:
authorDavid Woodhouse2006-05-06 20:59:18 +0200
committerDavid Woodhouse2006-05-06 20:59:18 +0200
commit5047f09b56d0bc3c21aec9cb16de60283da645c6 (patch)
tree09a07554b933c3bb912ce3bfc0ea7c7e1f16041c /drivers/s390/net/qeth_main.c
parentRevert include/media changes: Mauro says those ioctls are only used in-kernel(!) (diff)
parent[TCP]: Fix snd_cwnd adjustments in tcp_highspeed.c (diff)
downloadkernel-qcow2-linux-5047f09b56d0bc3c21aec9cb16de60283da645c6.tar.gz
kernel-qcow2-linux-5047f09b56d0bc3c21aec9cb16de60283da645c6.tar.xz
kernel-qcow2-linux-5047f09b56d0bc3c21aec9cb16de60283da645c6.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'drivers/s390/net/qeth_main.c')
-rw-r--r--drivers/s390/net/qeth_main.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c
index b3c6e7907790..cb14642d97aa 100644
--- a/drivers/s390/net/qeth_main.c
+++ b/drivers/s390/net/qeth_main.c
@@ -8014,7 +8014,6 @@ static int (*qeth_old_arp_constructor) (struct neighbour *);
static struct neigh_ops arp_direct_ops_template = {
.family = AF_INET,
- .destructor = NULL,
.solicit = NULL,
.error_report = NULL,
.output = dev_queue_xmit,