From 0098845dcf81774f51f375ed888c71778f757ad1 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 7 Oct 2010 16:25:58 -0700
Subject: [PATCH] --- yaml --- r: 220160 b: refs/heads/master c:
 624573d0d480a003c9ba042f524f311aef2e7c5f h: refs/heads/master v: v3

---
 [refs]                                         |  2 +-
 .../staging/brcm80211/include/linuxver.h       | 18 ------------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index fe78b29f96bb..8e5dc2ac5804 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ba9cfdbfc0fe3e84d150d66737210a34846e8a7
+refs/heads/master: 624573d0d480a003c9ba042f524f311aef2e7c5f
diff --git a/trunk/drivers/staging/brcm80211/include/linuxver.h b/trunk/drivers/staging/brcm80211/include/linuxver.h
index 96de383af57a..921cf66636f8 100644
--- a/trunk/drivers/staging/brcm80211/include/linuxver.h
+++ b/trunk/drivers/staging/brcm80211/include/linuxver.h
@@ -39,24 +39,6 @@ typedef irqreturn_t(*FN_ISR) (int irq, void *dev_id, struct pt_regs * ptregs);
 #include <linux/sched.h>
 #include <linux/ieee80211.h>
 
-#ifndef __exit
-#define __exit
-#endif
-#ifndef __devexit
-#define __devexit
-#endif
-#ifndef __devinit
-#define __devinit	__init
-#endif
-#ifndef __devinitdata
-#define __devinitdata
-#endif
-#ifndef __devexit_p
-#define __devexit_p(x)	x
-#endif
-
-#define netif_down(dev)
-
 /* suspend args */
 #define DRV_SUSPEND_STATE_TYPE pm_message_t