From 930c3cc1773ede9dbe1f7ec00342a0a7fb6854a5 Mon Sep 17 00:00:00 2001
From: Arend van Spriel <arend@broadcom.com>
Date: Wed, 1 Jun 2011 13:45:15 +0200
Subject: [PATCH] --- yaml --- r: 259370 b: refs/heads/master c:
 7885471758027255436073b69400ad67d1ee37b0 h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 .../staging/brcm80211/include/nicpci.h        | 29 +------------------
 2 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/[refs] b/[refs]
index e55dd7671250..bf99f2dde64a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0a0941b0a578dad4b70774bd88a155997c01844
+refs/heads/master: 7885471758027255436073b69400ad67d1ee37b0
diff --git a/trunk/drivers/staging/brcm80211/include/nicpci.h b/trunk/drivers/staging/brcm80211/include/nicpci.h
index 30321eb0477e..f901c608210d 100644
--- a/trunk/drivers/staging/brcm80211/include/nicpci.h
+++ b/trunk/drivers/staging/brcm80211/include/nicpci.h
@@ -17,32 +17,6 @@
 #ifndef	_NICPCI_H
 #define	_NICPCI_H
 
-#if defined(BCMSDIO) || (defined(BCMBUSTYPE) && (BCMBUSTYPE == SI_BUS))
-#define pcicore_find_pci_capability(a, b, c, d) (0)
-#define pcie_readreg(a, b, c, d) (0)
-#define pcie_writereg(a, b, c, d, e) (0)
-
-#define pcie_clkreq(a, b, c)	(0)
-#define pcie_lcreg(a, b, c)	(0)
-
-#define pcicore_init(a, b, c) (0x0dadbeef)
-#define pcicore_deinit(a)	do { } while (0)
-#define pcicore_attach(a, b, c)	do { } while (0)
-#define pcicore_hwup(a)		do { } while (0)
-#define pcicore_up(a, b)	do { } while (0)
-#define pcicore_sleep(a)	do { } while (0)
-#define pcicore_down(a, b)	do { } while (0)
-
-#define pcie_war_ovr_aspm_update(a, b)	do { } while (0)
-
-#define pcicore_pcieserdesreg(a, b, c, d, e) (0)
-#define pcicore_pciereg(a, b, c, d, e) (0)
-
-#define pcicore_pmecap_fast(a)	(false)
-#define pcicore_pmeen(a)	do { } while (0)
-#define pcicore_pmeclr(a)	do { } while (0)
-#define pcicore_pmestat(a)	(false)
-#else
 struct sbpcieregs;
 
 extern u8 pcicore_find_pci_capability(void *dev, u8 req_cap_id,
@@ -74,6 +48,5 @@ extern bool pcicore_pmecap_fast(void *pch);
 extern void pcicore_pmeen(void *pch);
 extern void pcicore_pmeclr(void *pch);
 extern bool pcicore_pmestat(void *pch);
-#endif /* defined(BCMSDIO)||(defined(BCMBUSTYPE) && (BCMBUSTYPE==SI_BUS)) */
 
-#endif				/* _NICPCI_H */
+#endif /* _NICPCI_H */