From 52ad6be7c64f819fd1daa6cbe6e0794e43a9b365 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 7 Oct 2010 16:19:11 -0700
Subject: [PATCH] --- yaml --- r: 220157 b: refs/heads/master c:
 c62add38420029de50d1e4c16795211d748dd08b h: refs/heads/master i:   220155:
 4c0a771a80d61e0b741b92e2e10728ce2e6c7742 v: v3

---
 [refs]                                          |  2 +-
 .../staging/brcm80211/brcmfmac/dhd_linux.c      |  2 --
 .../staging/brcm80211/brcmfmac/wl_cfg80211.c    |  1 -
 .../staging/brcm80211/include/linuxver.h        | 17 -----------------
 4 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/[refs] b/[refs]
index 422377ff26ff..fa89df127b9a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 364eb72a3965ddf3291be74562081b1c19813473
+refs/heads/master: c62add38420029de50d1e4c16795211d748dd08b
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index 1441b3336997..75f472411cd1 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -1787,7 +1787,6 @@ static int dhd_stop(struct net_device *net)
 		__func__));
 #endif				/* !defined(IGNORE_ETH0_DOWN) */
 
-	OLD_MOD_DEC_USE_COUNT;
 	return 0;
 }
 
@@ -1836,7 +1835,6 @@ static int dhd_open(struct net_device *net)
 	}
 #endif
 
-	OLD_MOD_INC_USE_COUNT;
 	return ret;
 }
 
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
index 11084cbf30dc..62f8e09aaafa 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
@@ -3129,7 +3129,6 @@ int32 wl_cfg80211_attach(struct net_device *ndev, void *data)
 	ci = (struct wl_iface *)wl_to_ci(wl);
 	ci->wl = wl;
 	ndev->ieee80211_ptr = wdev;
-	SET_NETDEV_DEV(ndev, wiphy_dev(wdev->wiphy));
 	wdev->netdev = ndev;
 	err = wl_init_priv(wl);
 	if (unlikely(err)) {
diff --git a/trunk/drivers/staging/brcm80211/include/linuxver.h b/trunk/drivers/staging/brcm80211/include/linuxver.h
index 0f8d8af3aa21..4986b3b8a540 100644
--- a/trunk/drivers/staging/brcm80211/include/linuxver.h
+++ b/trunk/drivers/staging/brcm80211/include/linuxver.h
@@ -63,23 +63,6 @@ typedef irqreturn_t(*FN_ISR) (int irq, void *dev_id, struct pt_regs * ptregs);
 #define	PCI_SAVE_STATE(a, b)	pci_save_state(a)
 #define	PCI_RESTORE_STATE(a, b)	pci_restore_state(a)
 
-/* Module refcount handled internally in 2.6.x */
-#ifndef SET_MODULE_OWNER
-#define SET_MODULE_OWNER(dev)		do {} while (0)
-#endif
-#ifndef MOD_INC_USE_COUNT
-#define MOD_INC_USE_COUNT			do {} while (0)
-#endif
-#ifndef MOD_DEC_USE_COUNT
-#define MOD_DEC_USE_COUNT			do {} while (0)
-#endif
-#define OLD_MOD_INC_USE_COUNT		MOD_INC_USE_COUNT
-#define OLD_MOD_DEC_USE_COUNT		MOD_DEC_USE_COUNT
-
-#ifndef SET_NETDEV_DEV
-#define SET_NETDEV_DEV(net, pdev)	do {} while (0)
-#endif
-
 #ifndef HAVE_FREE_NETDEV
 #define free_netdev(dev)		kfree(dev)
 #endif