diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-02 20:33:57 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-02 20:33:57 +0200 |
| commit | 1fb5fef9b80d9a3b5368e22031627afd1585487b (patch) | |
| tree | 54f07a532b5b2622b8642156bbcaeca637fcdb8f /drivers/s390/net | |
| parent | Merge branch 'master' into upstream (diff) | |
| parent | [PATCH] vmsplice: restrict stealing a little more (diff) | |
| download | linux-1fb5fef9b80d9a3b5368e22031627afd1585487b.tar.xz linux-1fb5fef9b80d9a3b5368e22031627afd1585487b.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/s390/net')
| -rw-r--r-- | drivers/s390/net/qeth_main.c | 1 |
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, |