diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-03-08 19:30:55 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-03-08 19:30:55 -0400 |
| commit | d15c22e78674f9a5bc0de0932a43abe1aafae303 (patch) | |
| tree | 3e4198c44bd2d9184e91647346c66aa95e28f843 /drivers/net/ne2k-pci.c | |
| parent | 0f4954819fb6f840d46076f0dbd313ef5da48f5d (diff) | |
| parent | fec6c6fec3e20637bee5d276fb61dd8b49a3f9cc (diff) | |
Merge commit 'v2.6.29-rc7' into next
Diffstat (limited to 'drivers/net/ne2k-pci.c')
| -rw-r--r-- | drivers/net/ne2k-pci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c index 62f20ba211cb..f090d3b9ec94 100644 --- a/drivers/net/ne2k-pci.c +++ b/drivers/net/ne2k-pci.c | |||
| @@ -208,6 +208,7 @@ static const struct net_device_ops ne2k_netdev_ops = { | |||
| 208 | .ndo_get_stats = ei_get_stats, | 208 | .ndo_get_stats = ei_get_stats, |
| 209 | .ndo_set_multicast_list = ei_set_multicast_list, | 209 | .ndo_set_multicast_list = ei_set_multicast_list, |
| 210 | .ndo_validate_addr = eth_validate_addr, | 210 | .ndo_validate_addr = eth_validate_addr, |
| 211 | .ndo_set_mac_address = eth_mac_addr, | ||
| 211 | .ndo_change_mtu = eth_change_mtu, | 212 | .ndo_change_mtu = eth_change_mtu, |
| 212 | #ifdef CONFIG_NET_POLL_CONTROLLER | 213 | #ifdef CONFIG_NET_POLL_CONTROLLER |
| 213 | .ndo_poll_controller = ei_poll, | 214 | .ndo_poll_controller = ei_poll, |