diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-23 02:17:28 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-23 02:17:28 -0500 |
| commit | 66a101dda6b26ee566aa9cadcbea904a41d2b268 (patch) | |
| tree | e03b5d40b7b88bb0a2f432bceba4680086d6d3a1 /drivers/net/smc-ultra.c | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
| parent | 28b7e343ee63454d563a71d2d5f769fc297fd5ad (diff) | |
Merge branch 'topic/hwdep-cleanup' into topic/hdsp
Diffstat (limited to 'drivers/net/smc-ultra.c')
| -rw-r--r-- | drivers/net/smc-ultra.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/smc-ultra.c b/drivers/net/smc-ultra.c index b3866089a206..2033fee3143a 100644 --- a/drivers/net/smc-ultra.c +++ b/drivers/net/smc-ultra.c | |||
| @@ -196,6 +196,7 @@ static const struct net_device_ops ultra_netdev_ops = { | |||
| 196 | .ndo_get_stats = ei_get_stats, | 196 | .ndo_get_stats = ei_get_stats, |
| 197 | .ndo_set_multicast_list = ei_set_multicast_list, | 197 | .ndo_set_multicast_list = ei_set_multicast_list, |
| 198 | .ndo_validate_addr = eth_validate_addr, | 198 | .ndo_validate_addr = eth_validate_addr, |
| 199 | .ndo_set_mac_address = eth_mac_addr, | ||
| 199 | .ndo_change_mtu = eth_change_mtu, | 200 | .ndo_change_mtu = eth_change_mtu, |
| 200 | #ifdef CONFIG_NET_POLL_CONTROLLER | 201 | #ifdef CONFIG_NET_POLL_CONTROLLER |
| 201 | .ndo_poll_controller = ei_poll, | 202 | .ndo_poll_controller = ei_poll, |