diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-16 23:21:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-16 23:21:24 -0400 |
| commit | da8120355e80ddaf534adb8ed910871d97512d56 (patch) | |
| tree | 9958a6c33e29b5af5faccf6650e98729151618a2 /drivers/net/usb/pegasus.c | |
| parent | c86ae82605ef92594a0de809a8c588ae955fed63 (diff) | |
| parent | 7fefe6a88494b00b151b5ca7bb84daaa781bbca7 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/orinoco/main.c
Diffstat (limited to 'drivers/net/usb/pegasus.c')
| -rw-r--r-- | drivers/net/usb/pegasus.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c index 632d1aeda570..69d2df95ac86 100644 --- a/drivers/net/usb/pegasus.c +++ b/drivers/net/usb/pegasus.c | |||
| @@ -1493,6 +1493,9 @@ static const struct net_device_ops pegasus_netdev_ops = { | |||
| 1493 | .ndo_set_multicast_list = pegasus_set_multicast, | 1493 | .ndo_set_multicast_list = pegasus_set_multicast, |
| 1494 | .ndo_get_stats = pegasus_netdev_stats, | 1494 | .ndo_get_stats = pegasus_netdev_stats, |
| 1495 | .ndo_tx_timeout = pegasus_tx_timeout, | 1495 | .ndo_tx_timeout = pegasus_tx_timeout, |
| 1496 | .ndo_change_mtu = eth_change_mtu, | ||
| 1497 | .ndo_set_mac_address = eth_mac_addr, | ||
| 1498 | .ndo_validate_addr = eth_validate_addr, | ||
| 1496 | }; | 1499 | }; |
| 1497 | 1500 | ||
| 1498 | static struct usb_driver pegasus_driver = { | 1501 | static struct usb_driver pegasus_driver = { |