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/arm | |
| 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/arm')
| -rw-r--r-- | drivers/net/arm/ixp4xx_eth.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c index 6f42ad728915..3fe09876e76d 100644 --- a/drivers/net/arm/ixp4xx_eth.c +++ b/drivers/net/arm/ixp4xx_eth.c | |||
| @@ -1142,7 +1142,9 @@ static const struct net_device_ops ixp4xx_netdev_ops = { | |||
| 1142 | .ndo_start_xmit = eth_xmit, | 1142 | .ndo_start_xmit = eth_xmit, |
| 1143 | .ndo_set_multicast_list = eth_set_mcast_list, | 1143 | .ndo_set_multicast_list = eth_set_mcast_list, |
| 1144 | .ndo_do_ioctl = eth_ioctl, | 1144 | .ndo_do_ioctl = eth_ioctl, |
| 1145 | 1145 | .ndo_change_mtu = eth_change_mtu, | |
| 1146 | .ndo_set_mac_address = eth_mac_addr, | ||
| 1147 | .ndo_validate_addr = eth_validate_addr, | ||
| 1146 | }; | 1148 | }; |
| 1147 | 1149 | ||
| 1148 | static int __devinit eth_init_one(struct platform_device *pdev) | 1150 | static int __devinit eth_init_one(struct platform_device *pdev) |