projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox...
[linux-2.6-microblaze.git]
/
drivers
/
net
/
ethernet
/
smsc
/
smc91c92_cs.c
diff --git
a/drivers/net/ethernet/smsc/smc91c92_cs.c
b/drivers/net/ethernet/smsc/smc91c92_cs.c
index
f2a50eb
..
42fc37c
100644
(file)
--- a/
drivers/net/ethernet/smsc/smc91c92_cs.c
+++ b/
drivers/net/ethernet/smsc/smc91c92_cs.c
@@
-294,7
+294,7
@@
static const struct net_device_ops smc_netdev_ops = {
.ndo_tx_timeout = smc_tx_timeout,
.ndo_set_config = s9k_config,
.ndo_set_rx_mode = set_rx_mode,
- .ndo_
do_ioctl
= smc_ioctl,
+ .ndo_
eth_ioctl
= smc_ioctl,
.ndo_set_mac_address = eth_mac_addr,
.ndo_validate_addr = eth_validate_addr,
};