From 415e390cef69bf94e86fc075d23add56e1dece60 Mon Sep 17 00:00:00 2001
From: Brett Rudley <brudley@broadcom.com>
Date: Tue, 30 Nov 2010 15:22:15 -0800
Subject: [PATCH] --- yaml --- r: 228244 b: refs/heads/master c:
 c53d201371bf45cdb5b843ade52edd8903bb72f6 h: refs/heads/master v: v3

---
 [refs]                                              |  2 +-
 trunk/drivers/staging/brcm80211/include/linux_osl.h | 11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index dd4537a8bc7e..df0a126c3629 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5343314f62ba392ec069210ae342bc32c4ce367
+refs/heads/master: c53d201371bf45cdb5b843ade52edd8903bb72f6
diff --git a/trunk/drivers/staging/brcm80211/include/linux_osl.h b/trunk/drivers/staging/brcm80211/include/linux_osl.h
index 0e2e53e623cf..94f5d12d53d9 100644
--- a/trunk/drivers/staging/brcm80211/include/linux_osl.h
+++ b/trunk/drivers/staging/brcm80211/include/linux_osl.h
@@ -29,17 +29,8 @@ extern u32 g_assert_type;
 	  do { if (!(exp)) osl_assert(#exp, __FILE__, __LINE__); } while (0)
 extern void osl_assert(char *exp, char *file, int line);
 #else
-#ifdef __GNUC__
-#define GCC_VERSION \
-			(__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
-#if GCC_VERSION > 30100
 #define ASSERT(exp)	do {} while (0)
-#else
-			/* ASSERT could cause segmentation fault on GCC3.1, use empty instead */
-#define ASSERT(exp)
-#endif				/* GCC_VERSION > 30100 */
-#endif				/* __GNUC__ */
-#endif				/* defined(BCMDBG_ASSERT) */
+#endif  /* defined(BCMDBG_ASSERT) */
 
 /* PCI device bus # and slot # */
 #define OSL_PCI_BUS(osh)	osl_pci_bus(osh)