diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
| commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
| tree | db28291df94a2043af2123911984c5c173da4e6f /drivers/net/tokenring/smctr.c | |
| parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
| parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/net/tokenring/smctr.c')
| -rw-r--r-- | drivers/net/tokenring/smctr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c index d9044aba7afa..029846a98636 100644 --- a/drivers/net/tokenring/smctr.c +++ b/drivers/net/tokenring/smctr.c | |||
| @@ -3623,7 +3623,7 @@ static const struct net_device_ops smctr_netdev_ops = { | |||
| 3623 | .ndo_start_xmit = smctr_send_packet, | 3623 | .ndo_start_xmit = smctr_send_packet, |
| 3624 | .ndo_tx_timeout = smctr_timeout, | 3624 | .ndo_tx_timeout = smctr_timeout, |
| 3625 | .ndo_get_stats = smctr_get_stats, | 3625 | .ndo_get_stats = smctr_get_stats, |
| 3626 | .ndo_set_multicast_list = smctr_set_multicast_list, | 3626 | .ndo_set_rx_mode = smctr_set_multicast_list, |
| 3627 | }; | 3627 | }; |
| 3628 | 3628 | ||
| 3629 | static int __init smctr_probe1(struct net_device *dev, int ioaddr) | 3629 | static int __init smctr_probe1(struct net_device *dev, int ioaddr) |