diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-15 09:45:31 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-15 09:45:31 -0500 |
| commit | 49a93bc978b4b3d564f6b330179b4cc2724a031d (patch) | |
| tree | 8b14b6c1d32b2a64bd9e7d0793717780ecc1d985 /drivers/net/via-velocity.c | |
| parent | 54da5b3d44238eeb7417bacf792fb416d473bf4d (diff) | |
| parent | a6525042bfdfcab128bd91fad264de10fd24a55e (diff) | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'drivers/net/via-velocity.c')
| -rw-r--r-- | drivers/net/via-velocity.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c index 58e25d090ae0..a75f91dc3153 100644 --- a/drivers/net/via-velocity.c +++ b/drivers/net/via-velocity.c | |||
| @@ -855,6 +855,7 @@ static const struct net_device_ops velocity_netdev_ops = { | |||
| 855 | .ndo_start_xmit = velocity_xmit, | 855 | .ndo_start_xmit = velocity_xmit, |
| 856 | .ndo_get_stats = velocity_get_stats, | 856 | .ndo_get_stats = velocity_get_stats, |
| 857 | .ndo_validate_addr = eth_validate_addr, | 857 | .ndo_validate_addr = eth_validate_addr, |
| 858 | .ndo_set_mac_address = eth_mac_addr, | ||
| 858 | .ndo_set_multicast_list = velocity_set_multi, | 859 | .ndo_set_multicast_list = velocity_set_multi, |
| 859 | .ndo_change_mtu = velocity_change_mtu, | 860 | .ndo_change_mtu = velocity_change_mtu, |
| 860 | .ndo_do_ioctl = velocity_ioctl, | 861 | .ndo_do_ioctl = velocity_ioctl, |