diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-26 23:48:40 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-26 23:48:40 -0800 |
| commit | 5b9ab2ec04ec1e1e53939768805612ac191d7ba2 (patch) | |
| tree | 22d29905c148d2d743b3eccb585fbe60fb91e25a /drivers/net/hp-plus.c | |
| parent | 851fd7bd88524bb4e20f3def3127cd9167d6d0cf (diff) | |
| parent | 3ec192559033ed457f0d7856838654c100fc659f (diff) | |
| download | kernel_samsung_smdk4412-5b9ab2ec04ec1e1e53939768805612ac191d7ba2.zip kernel_samsung_smdk4412-5b9ab2ec04ec1e1e53939768805612ac191d7ba2.tar.gz kernel_samsung_smdk4412-5b9ab2ec04ec1e1e53939768805612ac191d7ba2.tar.bz2 | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/hp-plus.c
drivers/net/wireless/ath5k/base.c
drivers/net/wireless/ath9k/recv.c
net/wireless/reg.c
Diffstat (limited to 'drivers/net/hp-plus.c')
| -rw-r--r-- | drivers/net/hp-plus.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/hp-plus.c b/drivers/net/hp-plus.c index c34411c..b507dbc 100644 --- a/drivers/net/hp-plus.c +++ b/drivers/net/hp-plus.c @@ -161,14 +161,14 @@ out: static const struct net_device_ops hpp_netdev_ops = { .ndo_open = hpp_open, .ndo_stop = hpp_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 = eip_start_xmit, + .ndo_tx_timeout = eip_tx_timeout, + .ndo_get_stats = eip_get_stats, + .ndo_set_multicast_list = eip_set_multicast_list, .ndo_validate_addr = eth_validate_addr, .ndo_change_mtu = eth_change_mtu, #ifdef CONFIG_NET_POLL_CONTROLLER - .ndo_poll_controller = ei_poll, + .ndo_poll_controller = eip_poll, #endif }; |