diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-20 03:23:28 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-20 03:23:28 -0500 |
| commit | 0ce1c383681370964e7f77dd44506aeb3a6ba657 (patch) | |
| tree | 75aa590c636feed7d110c03eddb56cc518fc034c /drivers/net/sc92031.c | |
| parent | 0a2a18b721abc960fbcada406746877d22340a60 (diff) | |
| parent | 1de9e8e70f5acc441550ca75433563d91b269bbe (diff) | |
Merge commit 'v2.6.29-rc2' into x86/mm
Diffstat (limited to 'drivers/net/sc92031.c')
| -rw-r--r-- | drivers/net/sc92031.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/sc92031.c b/drivers/net/sc92031.c index 42fd31276602..8b75bef4a841 100644 --- a/drivers/net/sc92031.c +++ b/drivers/net/sc92031.c | |||
| @@ -1408,6 +1408,7 @@ static const struct net_device_ops sc92031_netdev_ops = { | |||
| 1408 | .ndo_set_multicast_list = sc92031_set_multicast_list, | 1408 | .ndo_set_multicast_list = sc92031_set_multicast_list, |
| 1409 | .ndo_change_mtu = eth_change_mtu, | 1409 | .ndo_change_mtu = eth_change_mtu, |
| 1410 | .ndo_validate_addr = eth_validate_addr, | 1410 | .ndo_validate_addr = eth_validate_addr, |
| 1411 | .ndo_set_mac_address = eth_mac_addr, | ||
| 1411 | .ndo_tx_timeout = sc92031_tx_timeout, | 1412 | .ndo_tx_timeout = sc92031_tx_timeout, |
| 1412 | #ifdef CONFIG_NET_POLL_CONTROLLER | 1413 | #ifdef CONFIG_NET_POLL_CONTROLLER |
| 1413 | .ndo_poll_controller = sc92031_poll_controller, | 1414 | .ndo_poll_controller = sc92031_poll_controller, |