Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6...

[pandora-kernel.git] / drivers / net / wireless / b43 / b43.h

diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h
index 3c8200c..ee4d06f 100644 (file)
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
@@ -650,7 +650,7 @@ struct b43_request_fw_context {
        char errors[B43_NR_FWTYPES][128];
        /* Temporary buffer for storing the firmware name. */
        char fwname[64];
-       /* A fatal error occured while requesting. Firmware reqest
+       /* A fatal error occurred while requesting. Firmware reqest
         * can not continue, as any other reqest will also fail. */
        int fatal_failure;
 };