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

[pandora-kernel.git] / drivers / net / wireless / p54 / main.c

diff --git a/drivers/net/wireless/p54/main.c b/drivers/net/wireless/p54/main.c
index c5c1254..a5a6d9e 100644 (file)
--- a/drivers/net/wireless/p54/main.c
+++ b/drivers/net/wireless/p54/main.c
@@ -494,7 +494,7 @@ static int p54_set_key(struct ieee80211_hw *dev, enum set_key_cmd cmd,
 
                if (slot < 0) {
                        /*
-                        * The device supports the choosen algorithm, but the
+                        * The device supports the chosen algorithm, but the
                         * firmware does not provide enough key slots to store
                         * all of them.
                         * But encryption offload for outgoing frames is always