aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/sb1250-mac.c2
-rw-r--r--drivers/net/tg3.c2
-rw-r--r--drivers/net/wireless/ipw2x00/ipw2100.c2
-rw-r--r--drivers/net/wireless/ipw2x00/ipw2200.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c2
-rw-r--r--drivers/net/wireless/libertas/cmd.c2
7 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c
index 88dd2e09832f..ce7551e17ba7 100644
--- a/drivers/net/sb1250-mac.c
+++ b/drivers/net/sb1250-mac.c
@@ -2299,7 +2299,7 @@ static int sbmac_init(struct platform_device *pldev, long long base)
2299 eaddr = sc->sbm_hwaddr; 2299 eaddr = sc->sbm_hwaddr;
2300 2300
2301 /* 2301 /*
2302 * Read the ethernet address. The firwmare left this programmed 2302 * Read the ethernet address. The firmware left this programmed
2303 * for us in the ethernet address register for each mac. 2303 * for us in the ethernet address register for each mac.
2304 */ 2304 */
2305 2305
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index f7efcecc4108..ed60b18addac 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -11225,7 +11225,7 @@ static int __devinit tg3_phy_probe(struct tg3 *tp)
11225 return tg3_phy_init(tp); 11225 return tg3_phy_init(tp);
11226 11226
11227 /* Reading the PHY ID register can conflict with ASF 11227 /* Reading the PHY ID register can conflict with ASF
11228 * firwmare access to the PHY hardware. 11228 * firmware access to the PHY hardware.
11229 */ 11229 */
11230 err = 0; 11230 err = 0;
11231 if ((tp->tg3_flags & TG3_FLAG_ENABLE_ASF) || 11231 if ((tp->tg3_flags & TG3_FLAG_ENABLE_ASF) ||
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index 115b70487502..f4e963ba768b 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -2362,7 +2362,7 @@ static void ipw2100_corruption_detected(struct ipw2100_priv *priv, int i)
2362 i * sizeof(struct ipw2100_status)); 2362 i * sizeof(struct ipw2100_status));
2363 2363
2364#ifdef IPW2100_DEBUG_C3 2364#ifdef IPW2100_DEBUG_C3
2365 /* Halt the fimrware so we can get a good image */ 2365 /* Halt the firmware so we can get a good image */
2366 write_register(priv->net_dev, IPW_REG_RESET_REG, 2366 write_register(priv->net_dev, IPW_REG_RESET_REG,
2367 IPW_AUX_HOST_RESET_REG_STOP_MASTER); 2367 IPW_AUX_HOST_RESET_REG_STOP_MASTER);
2368 j = 5; 2368 j = 5;
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index b3449948a25a..f6174fdc12bf 100644
--- 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,
8844#endif /* CONFIG_IPW2200_MONITOR */ 8844#endif /* CONFIG_IPW2200_MONITOR */
8845 8845
8846 /* Free the existing firmware and reset the fw_loaded 8846 /* Free the existing firmware and reset the fw_loaded
8847 * flag so ipw_load() will bring in the new firmawre */ 8847 * flag so ipw_load() will bring in the new firmware */
8848 free_firmware(); 8848 free_firmware();
8849 8849
8850 priv->ieee->iw_mode = wrqu->mode; 8850 priv->ieee->iw_mode = wrqu->mode;
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 663dc83be501..3889158b359c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -1337,7 +1337,7 @@ static int iwl_read_ucode(struct iwl_priv *priv)
1337 1337
1338 /* api_ver should match the api version forming part of the 1338 /* api_ver should match the api version forming part of the
1339 * firmware filename ... but we don't check for that and only rely 1339 * firmware filename ... but we don't check for that and only rely
1340 * on the API version read from firware header from here on forward */ 1340 * on the API version read from firmware header from here on forward */
1341 1341
1342 if (api_ver < api_min || api_ver > api_max) { 1342 if (api_ver < api_min || api_ver > api_max) {
1343 IWL_ERR(priv, "Driver unable to support your firmware API. " 1343 IWL_ERR(priv, "Driver unable to support your firmware API. "
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index a71b08ca7c71..9d5f97dd7c73 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -2562,7 +2562,7 @@ static int iwl3945_read_ucode(struct iwl_priv *priv)
2562 2562
2563 /* api_ver should match the api version forming part of the 2563 /* api_ver should match the api version forming part of the
2564 * firmware filename ... but we don't check for that and only rely 2564 * firmware filename ... but we don't check for that and only rely
2565 * on the API version read from firware header from here on forward */ 2565 * on the API version read from firmware header from here on forward */
2566 2566
2567 if (api_ver < api_min || api_ver > api_max) { 2567 if (api_ver < api_min || api_ver > api_max) {
2568 IWL_ERR(priv, "Driver unable to support your firmware API. " 2568 IWL_ERR(priv, "Driver unable to support your firmware API. "
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index 639dd02d3d31..8c3605cdc64c 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -1649,7 +1649,7 @@ static struct cmd_ctrl_node *lbs_get_cmd_ctrl_node(struct lbs_private *priv)
1649 1649
1650/** 1650/**
1651 * @brief This function executes next command in command 1651 * @brief This function executes next command in command
1652 * pending queue. It will put fimware back to PS mode 1652 * pending queue. It will put firmware back to PS mode
1653 * if applicable. 1653 * if applicable.
1654 * 1654 *
1655 * @param priv A pointer to struct lbs_private structure 1655 * @param priv A pointer to struct lbs_private structure