Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[sfrench/cifs-2.6.git] / drivers / net / wireless / ipw2x00 / ipw2200.c

diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index f6174fdc12bfb3314f83f56c8d1a0af1dddcb9b4..e17a4593e1f5f1d3c82fa5830b51d7c9bf78628a 100644 (file)
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -11593,7 +11593,6 @@ static const struct net_device_ops ipw_netdev_ops = {
        .ndo_set_mac_address    = ipw_net_set_mac_address,
        .ndo_start_xmit         = ieee80211_xmit,
        .ndo_change_mtu         = ieee80211_change_mtu,
-       .ndo_set_mac_address    = eth_mac_addr,
        .ndo_validate_addr      = eth_validate_addr,
 };