Merge remote branch 'origin' into secretlab/next-devicetree

[safe/jmp/linux-2.6] / drivers / net / ps3_gelic_wireless.c

diff --git a/drivers/net/ps3_gelic_wireless.c b/drivers/net/ps3_gelic_wireless.c
index a9153a3..43b8d77 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 */
 };
 
@@ -300,7 +301,6 @@ static void gelic_wl_get_ch_info(struct gelic_wl_info *wl)
                        /* 16 bits of MSB has available channels */
                        wl->ch_info = ch_info_raw >> 48;
        }
-       return;
 }
 
 /* SIOGIWRANGE */
@@ -896,7 +896,7 @@ static int gelic_wl_set_auth(struct net_device *netdev,
        default:
                ret = -EOPNOTSUPP;
                break;
-       };
+       }
 
        if (!ret)
                set_bit(GELIC_WL_STAT_CONFIGURED, &wl->stat);
@@ -1991,7 +1991,7 @@ static int gelic_wl_associate_bss(struct gelic_wl_info *wl,
        case GELIC_WL_WPA_LEVEL_WPA2:
                ret = gelic_wl_do_wpa_setup(wl);
                break;
-       };
+       }
 
        if (ret) {
                pr_debug("%s: WEP/WPA setup failed %d\n", __func__,