git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
ipw2x00
/
ipw2200.c
diff --git
a/drivers/net/wireless/ipw2x00/ipw2200.c
b/drivers/net/wireless/ipw2x00/ipw2200.c
index
b344994
..
e17a459
100644
(file)
--- a/
drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/
drivers/net/wireless/ipw2x00/ipw2200.c
@@
-8844,7
+8844,7
@@
static int ipw_wx_set_mode(struct net_device *dev,
#endif /* CONFIG_IPW2200_MONITOR */
/* Free the existing firmware and reset the fw_loaded
#endif /* CONFIG_IPW2200_MONITOR */
/* Free the existing firmware and reset the fw_loaded
- * flag so ipw_load() will bring in the new firm
aw
re */
+ * flag so ipw_load() will bring in the new firm
wa
re */
free_firmware();
priv->ieee->iw_mode = wrqu->mode;
free_firmware();
priv->ieee->iw_mode = wrqu->mode;
@@
-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 = 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,
};
.ndo_validate_addr = eth_validate_addr,
};