Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5c28f25 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "staging: brcm80211: assure common sources are truly common" 



This reverts commit ead12564 as it
broke the build when building with multiple threads at the same time.

Cc: Brett Rudley <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Roland Vossen <rvossen@broadcom.com>
Cc: Arend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ead12564

drivers/staging/brcm80211/Kconfig

+7 −7
Original line number Diff line number Diff line
@@ -2,6 +2,12 @@ menuconfig BRCM80211 
	tristate "Broadcom IEEE802.11n WLAN drivers"

	depends on WLAN



choice

	prompt "Broadcom IEEE802.11n driver style"

	depends on BRCM80211

	help

	Select the appropriate driver style from the list below.



config BRCMSMAC

	bool "Broadcom IEEE802.11n PCIe SoftMAC WLAN driver"

	depends on PCI
@@ -24,10 +30,4 @@ config BRCMFMAC 
	  Broadcom IEEE802.11n FullMAC chipsets.  This driver uses the kernel's

	  wireless extensions subsystem.  If you choose to build a module,

	  it'll be called brcmfmac.ko.



config BRCMDBG

	bool "Broadcom driver debug functions"

	default n

	depends on BRCM80211

	---help---

	  Selecting this enables additional code for debug purposes.
 
endchoice

drivers/staging/brcm80211/Makefile

+2 −3
Original line number Diff line number Diff line
@@ -15,9 +15,8 @@ 
# OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.



# common flags

subdir-ccflags-y			:= -DBCMDMA32

subdir-ccflags-$(CONFIG_BRCMDBG)	+= -DBCMDBG -DBCMDBG_ASSERT

# one and only common flag

subdir-ccflags-y := -DBCMDBG



obj-$(CONFIG_BRCMFMAC)	+= brcmfmac/

obj-$(CONFIG_BRCMSMAC)	+= brcmsmac/

drivers/staging/brcm80211/brcmfmac/Makefile

+3 −6
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ ccflags-y := \ 
	-DBCMSDIO		\

	-DBDC			\

	-DBRCM_FULLMAC		\

	-DDHD_DEBUG		\

	-DDHD_FIRSTREAD=64	\

	-DDHD_SCHED		\

	-DDHD_SDALIGN=64	\
@@ -30,11 +31,7 @@ ccflags-y := \ 
	-DMMC_SDIO_ABORT	\

	-DPKT_FILTER_SUPPORT	\

	-DSHOW_EVENTS		\

	-DTOE



ccflags-$(CONFIG_BRCMDBG)	+= -DDHD_DEBUG



ccflags-y += \

	-DTOE			\

	-Idrivers/staging/brcm80211/brcmfmac		\

	-Idrivers/staging/brcm80211/include		\

	-Idrivers/staging/brcm80211/util

drivers/staging/brcm80211/brcmsmac/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ ccflags-y := \ 
	-DWME					\

	-DWL11N					\

	-DDBAND					\

	-DBCMDMA32				\

	-DBCMNVRAMR				\

	-Idrivers/staging/brcm80211/brcmsmac \

	-Idrivers/staging/brcm80211/brcmsmac/phy \

drivers/staging/brcm80211/util/aiutils.c

+4 −0
Original line number Diff line number Diff line
@@ -131,8 +131,10 @@ void ai_scan(si_t *sih, void *regs, uint devid) 
		eromptr = regs;

		break;



#ifdef BCMSDIO

	case SPI_BUS:

	case SDIO_BUS:

#endif				/* BCMSDIO */

		eromptr = (u32 *)(unsigned long)erombase;

		break;
@@ -353,8 +355,10 @@ void *ai_setcoreidx(si_t *sih, uint coreidx) 
		pci_write_config_dword(sii->osh->pdev, PCI_BAR0_WIN2, wrap);

		break;



#ifdef BCMSDIO

	case SPI_BUS:

	case SDIO_BUS:

#endif				/* BCMSDIO */

		sii->curmap = regs = (void *)(unsigned long)addr;

		sii->curwrap = (void *)(unsigned long)wrap;

		break;