include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[mv-sheeva.git] / drivers / staging / rtl8192e / ieee80211 / ieee80211_wx.c

diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c
index 3441b72dd8fa17ef517eb1b171dacd62f7fd9b30..de57967b9681d71c72ae630b0d3e3b0364aac79c 100644 (file)
--- a/drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c
+++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c
@@ -32,6 +32,7 @@
 #include <linux/wireless.h>
 #include <linux/version.h>
 #include <linux/kmod.h>
+#include <linux/slab.h>
 #include <linux/module.h>
 
 #include "ieee80211.h"
@@ -386,10 +387,10 @@ int ieee80211_wx_get_scan(struct ieee80211_device *ieee,
                else
                        IEEE80211_DEBUG_SCAN(
                                "Not showing network '%s ("
-                               MAC_FMT ")' due to age (%lums).\n",
+                               "%pM)' due to age (%lums).\n",
                                escape_essid(network->ssid,
                                             network->ssid_len),
-                               MAC_ARG(network->bssid),
+                               network->bssid,
                                (jiffies - network->last_scanned) / (HZ / 100));
        }
 
@@ -933,7 +934,7 @@ int ieee80211_wx_set_auth(struct ieee80211_device *ieee,
 #if 1
        case IW_AUTH_WPA_ENABLED:
                ieee->wpa_enabled = (data->value)?1:0;
-               //printk("enalbe wpa:%d\n", ieee->wpa_enabled);
+               //printk("enable wpa:%d\n", ieee->wpa_enabled);
                break;
 
 #endif