From 264e4034e647206b6587de9af46da0a9808e2602 Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Thu, 14 Jul 2011 17:22:17 -0500
Subject: [PATCH] --- yaml --- r: 267690 b: refs/heads/master c:
 438af18e9278157a94b4f1ecb50cf9aa9437ebc2 h: refs/heads/master v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/staging/rtl8192e/rtllib.h | 19 -------------------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index 360e53a9b86e..ff97032a8d49 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af7daa15f7ab1c43091e6fc437bd2b4b5e7df60a
+refs/heads/master: 438af18e9278157a94b4f1ecb50cf9aa9437ebc2
diff --git a/trunk/drivers/staging/rtl8192e/rtllib.h b/trunk/drivers/staging/rtl8192e/rtllib.h
index 4ecfe5f0e083..352ee474bbfa 100644
--- a/trunk/drivers/staging/rtl8192e/rtllib.h
+++ b/trunk/drivers/staging/rtl8192e/rtllib.h
@@ -454,27 +454,8 @@ typedef enum _RT_OP_MODE{
 #define	IEEE_CRYPT_ALG_NAME_LEN			16
 
 #define MAX_IE_LEN  0xff
-#ifdef ENABLE_NULL_PT_DEBUG
-#define RT_ASSERT_RET(_Exp)								\
-		if (!(_Exp))									\
-		{											\
-			printk("Rtl819x: ");					\
-			printk( "Assertion failed! %s,%s,line=%d\n", \
-			#_Exp,__func__,__LINE__);          \
-			return;						\
-		}
-#define RT_ASSERT_RET_VALUE(_Exp,Ret)								\
-		if (!(_Exp))									\
-		{											\
-			printk("Rtl819x: ");					\
-			printk( "Assertion failed! %s,%s,line=%d\n", \
-			#_Exp,__func__,__LINE__);          \
-			return (Ret);						\
-		}
-#else
 #define RT_ASSERT_RET(_Exp) do {} while(0)
 #define RT_ASSERT_RET_VALUE(_Exp,Ret) do {} while(0)
-#endif
 
 typedef struct ieee_param {
 	u32 cmd;