diff options
| author | James Morris <jmorris@namei.org> | 2009-06-19 02:20:55 +0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-06-19 02:20:55 +0400 |
| commit | d905163c5b23f6d8511971e06081a1b525e8a0bd (patch) | |
| tree | f76918c1be802ec068d37763466f5518efdb690e /drivers/net/8390.c | |
| parent | 44c2d9bdd7022ca7d240d5adc009296fc1c6ce08 (diff) | |
| parent | 0732f87761dbe417cb6e084b712d07e879e876ef (diff) | |
| download | linux-d905163c5b23f6d8511971e06081a1b525e8a0bd.tar.xz | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/net/8390.c')
| -rw-r--r-- | drivers/net/8390.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/8390.c b/drivers/net/8390.c index ec3e22e6306f..21153dea8ebe 100644 --- a/drivers/net/8390.c +++ b/drivers/net/8390.c @@ -74,14 +74,8 @@ EXPORT_SYMBOL(ei_netdev_ops); struct net_device *__alloc_ei_netdev(int size) { struct net_device *dev = ____alloc_ei_netdev(size); -#ifdef CONFIG_COMPAT_NET_DEV_OPS - if (dev) { - dev->hard_start_xmit = ei_start_xmit; - dev->get_stats = ei_get_stats; - dev->set_multicast_list = ei_set_multicast_list; - dev->tx_timeout = ei_tx_timeout; - } -#endif + if (dev) + dev->netdev_ops = &ei_netdev_ops; return dev; } EXPORT_SYMBOL(__alloc_ei_netdev); |