Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[safe/jmp/linux-2.6] / drivers / net / wireless / b43 / main.c

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 16580d0..1521b1e 100644 (file)
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -2977,7 +2977,7 @@ static void do_periodic_work(struct b43_wldev *dev)
 /* Periodic work locking policy:
  *     The whole periodic work handler is protected by
  *     wl->mutex. If another lock is needed somewhere in the
- *     pwork callchain, it's aquired in-place, where it's needed.
+ *     pwork callchain, it's acquired in-place, where it's needed.
  */
 static void b43_periodic_work_handler(struct work_struct *work)
 {