diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-03 11:43:41 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-03 11:43:41 +0200 |
| commit | b2f8f7525c8aa1fdd8ad8c72c832dfb571d5f768 (patch) | |
| tree | 71ae1801d264bca62efa0d22376b49de7f206e9a /drivers/net/mac8390.c | |
| parent | mlx4_en: Updated driver version (diff) | |
| parent | net_cls: fix unconfigured struct tcf_proto keeps chaining and avoid kernel pa... (diff) | |
| download | linux-b2f8f7525c8aa1fdd8ad8c72c832dfb571d5f768.tar.xz linux-b2f8f7525c8aa1fdd8ad8c72c832dfb571d5f768.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/forcedeth.c
Diffstat (limited to 'drivers/net/mac8390.c')
| -rw-r--r-- | drivers/net/mac8390.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/mac8390.c b/drivers/net/mac8390.c index 0585df1e2c1b..f8fa0c3f0f64 100644 --- a/drivers/net/mac8390.c +++ b/drivers/net/mac8390.c @@ -304,7 +304,7 @@ struct net_device * __init mac8390_probe(int unit) if (!MACH_IS_MAC) return ERR_PTR(-ENODEV); - dev = alloc_ei_netdev(); + dev = ____alloc_ei_netdev(0); if (!dev) return ERR_PTR(-ENOMEM); @@ -481,15 +481,15 @@ void cleanup_module(void) static const struct net_device_ops mac8390_netdev_ops = { .ndo_open = mac8390_open, .ndo_stop = mac8390_close, - .ndo_start_xmit = ei_start_xmit, - .ndo_tx_timeout = ei_tx_timeout, - .ndo_get_stats = ei_get_stats, - .ndo_set_multicast_list = ei_set_multicast_list, + .ndo_start_xmit = __ei_start_xmit, + .ndo_tx_timeout = __ei_tx_timeout, + .ndo_get_stats = __ei_get_stats, + .ndo_set_multicast_list = __ei_set_multicast_list, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = eth_mac_addr, .ndo_change_mtu = eth_change_mtu, #ifdef CONFIG_NET_POLL_CONTROLLER - .ndo_poll_controller = ei_poll, + .ndo_poll_controller = __ei_poll, #endif }; |