From d50845642ff9c9173d844187a5a2e22f76c18dad Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Thu, 14 Jul 2011 09:58:36 -0500
Subject: [PATCH] --- yaml --- r: 267682 b: refs/heads/master c:
 d32ddcba9d67b7d647576df9f8f62934956c60b9 h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/staging/rtl8192e/rtllib_softmac.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 8ebd02fd6bf6..4156640da4dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eccf634fc84c2e441b34a2c0bc4706616b8ff005
+refs/heads/master: d32ddcba9d67b7d647576df9f8f62934956c60b9
diff --git a/trunk/drivers/staging/rtl8192e/rtllib_softmac.c b/trunk/drivers/staging/rtl8192e/rtllib_softmac.c
index 420ba4398bc1..5f65b58286ce 100644
--- a/trunk/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/trunk/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -608,13 +608,11 @@ void rtllib_softmac_scan_syncro(struct rtllib_device *ieee, u8 is_mesh)
 
 	ieee->be_scan_inprogress = false;
 
-#ifndef FOR_MOBLIN
 	{
 	union iwreq_data wrqu;
 	memset(&wrqu, 0, sizeof(wrqu));
 	wireless_send_event(ieee->dev,SIOCGIWSCAN,&wrqu,NULL);
 	}
-#endif
 }
 
 void rtllib_softmac_scan_wq(void *data)
@@ -2942,10 +2940,7 @@ void rtllib_disassociate(struct rtllib_device *ieee)
 
 	queue_delayed_work_rsl(ieee->wq, &ieee->link_change_wq, 0);
 
-
-#ifndef FOR_ANDROID_X86
 	notify_wx_assoc_event(ieee);
-#endif
 }
 
 void rtllib_associate_retry_wq(void *data)