---

yaml --- r: 291735 b: refs/heads/master c: 7d65fd7 h: refs/heads/master i: 291733: d7d3a56 291731: 980f3de 291727: d477034 v: v3
git-mirror · Feb 21, 2012 · 6ee4080 · 6ee4080
1 parent 223f3c4
commit 6ee4080
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 933025492f2d6d42c5c7c4df635291a52fd41904
+refs/heads/master: 7d65fd76e78f16be60ec01f11ce56969627e7b63
diff --git a/trunk/drivers/net/wireless/hostap/hostap_hw.c b/trunk/drivers/net/wireless/hostap/hostap_hw.c
@@ -1470,7 +1470,7 @@ static int prism2_hw_enable(struct net_device *dev, int initial)
 	 * before it starts acting as an AP, so reset port automatically
 	 * here just in case */
 	if (initial && prism2_reset_port(dev)) {
-		printk("%s: MAC port 0 reseting failed\n", dev->name);
+		printk("%s: MAC port 0 resetting failed\n", dev->name);
 		return 1;
 	}
 
@@ -1561,7 +1561,7 @@ static void prism2_hw_reset(struct net_device *dev)
 	static long last_reset = 0;
 
 	/* do not reset card more than once per second to avoid ending up in a
-	 * busy loop reseting the card */
+	 * busy loop resetting the card */
 	if (time_before_eq(jiffies, last_reset + HZ))
 		return;
 	last_reset = jiffies;