diff options
| author | Arend van Spriel <[email protected]> | 2011-06-29 16:47:29 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2011-07-05 09:57:20 -0700 |
| commit | e0d319f5c7d59756d27f29bd40ea539c090a7c98 (patch) | |
| tree | 6a41c09cfe047056fbd0c726643067a87a325961 | |
| parent | f3341e71f079798605e26519c49bacf398f25b72 (diff) | |
staging: brcm80211: always enable code for PLATFORM_BUS functionality
Some code is conditionally compiled in upon defintion of PLATFORM_BUS
macro. This patch will have it compiled in unconditionally.
Signed-off-by: Arend van Spriel <[email protected]>
Reviewed-by: Roland Vossen <[email protected]>
Reviewed-by: Franky Lin <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/Makefile | 1 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c | 9 |
2 files changed, 0 insertions, 10 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/Makefile b/drivers/staging/brcm80211/brcmfmac/Makefile index f76e62aaa0f2..0674a6ab3792 100644 --- a/drivers/staging/brcm80211/brcmfmac/Makefile +++ b/drivers/staging/brcm80211/brcmfmac/Makefile @@ -16,7 +16,6 @@ # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ccflags-y := \ - -DBCMPLATFORM_BUS \ -DBCMSDIO \ -DBRCM_FULLMAC \ -DBRCMF_FIRSTREAD=64 \ diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c index 5243f335f955..5194c590368f 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c @@ -36,9 +36,6 @@ extern void brcmf_sdbrcm_isr(void *args); #endif /* defined(OOB_INTR_ONLY) */ #if defined(CONFIG_MACH_SANDGATE2G) || defined(CONFIG_MACH_LOGICPD_PXA270) -#if !defined(BCMPLATFORM_BUS) -#define BCMPLATFORM_BUS -#endif /* !defined(BCMPLATFORM_BUS) */ #include <linux/platform_device.h> #endif /* CONFIG_MACH_SANDGATE2G */ @@ -51,11 +48,7 @@ extern void brcmf_sdbrcm_isr(void *args); */ struct bcmsdh_hc { struct bcmsdh_hc *next; -#ifdef BCMPLATFORM_BUS struct device *dev; /* platform device handle */ -#else - struct pci_dev *dev; /* pci device handle */ -#endif /* BCMPLATFORM_BUS */ void *regs; /* SDIO Host Controller address */ struct brcmf_sdio *sdh; /* SDIO Host Controller handle */ void *ch; @@ -120,7 +113,6 @@ bool brcmf_sdio_chipmatch(u16 vendor, u16 device) return false; } -#if defined(BCMPLATFORM_BUS) /* forward declarations */ int brcmf_sdio_probe(struct device *dev); EXPORT_SYMBOL(brcmf_sdio_probe); @@ -228,7 +220,6 @@ int brcmf_sdio_remove(struct device *dev) kfree(sdhc); return 0; } -#endif /* BCMPLATFORM_BUS */ extern int brcmf_sdio_function_init(void); |