Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
index bc08464d8323..a45818ebfdfb 100644
--- a/drivers/net/wireless/prism54/isl_ioctl.c
+++ b/drivers/net/wireless/prism54/isl_ioctl.c
@@ -23,6 +23,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/if_arp.h>
+#include <linux/slab.h>
 #include <linux/pci.h>
 
 #include <asm/uaccess.h>
@@ -1897,7 +1898,7 @@ prism54_get_mac(struct net_device *ndev, struct iw_request_info *info,
         return 0;
 }
 
-/* Setting policy also clears the MAC acl, even if we don't change the defaut
+/* Setting policy also clears the MAC acl, even if we don't change the default
  * policy
  */
 
@@ -2323,7 +2324,7 @@ prism54_process_trap_helper(islpci_private *priv, enum oid_num_t oid,
 
         case DOT11_OID_BEACON:
                 send_formatted_event(priv,
-                                     "Received a beacon from an unkown AP",
+                                     "Received a beacon from an unknown AP",
                                      mlme, 0);
                 break;