diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-04-01 22:17:41 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-01 22:17:41 -0400 |
| commit | c4361bb64b81f5b81a7a08d58654493385a2f2b2 (patch) | |
| tree | 8741c0b60ddfbc3fc4e17c8d200f6aa6ff32cca0 /drivers/net/wireless/zd1201.c | |
| parent | 46368fa05164e1afdc1401294908cf30c6d8d981 (diff) | |
| parent | 833bb3046b6cb320e775ea2160ddca87d53260d5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/wireless/zd1201.c')
| -rw-r--r-- | drivers/net/wireless/zd1201.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c index 9b244c96b221..5fabd9c0f07a 100644 --- a/drivers/net/wireless/zd1201.c +++ b/drivers/net/wireless/zd1201.c | |||
| @@ -1725,7 +1725,6 @@ static const struct net_device_ops zd1201_netdev_ops = { | |||
| 1725 | .ndo_set_multicast_list = zd1201_set_multicast, | 1725 | .ndo_set_multicast_list = zd1201_set_multicast, |
| 1726 | .ndo_set_mac_address = zd1201_set_mac_address, | 1726 | .ndo_set_mac_address = zd1201_set_mac_address, |
| 1727 | .ndo_change_mtu = eth_change_mtu, | 1727 | .ndo_change_mtu = eth_change_mtu, |
| 1728 | .ndo_set_mac_address = eth_mac_addr, | ||
| 1729 | .ndo_validate_addr = eth_validate_addr, | 1728 | .ndo_validate_addr = eth_validate_addr, |
| 1730 | }; | 1729 | }; |
| 1731 | 1730 | ||