Merge branch 'master' into for-next

[pandora-kernel.git] / drivers / net / ps3_gelic_wireless.c

diff --git a/drivers/net/ps3_gelic_wireless.c b/drivers/net/ps3_gelic_wireless.c
index 2663b2f..369a801 100644 (file)
--- a/drivers/net/ps3_gelic_wireless.c
+++ b/drivers/net/ps3_gelic_wireless.c
@@ -21,6 +21,7 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
@@ -95,7 +96,7 @@ static inline int precise_ie(void)
  * post_eurus_cmd helpers
  */
 struct eurus_cmd_arg_info {
-       int pre_arg; /* command requres arg1, arg2 at POST COMMAND */
+       int pre_arg; /* command requires arg1, arg2 at POST COMMAND */
        int post_arg; /* command requires arg1, arg2 at GET_RESULT */
 };