Commit 05491d2c authored by Kalle Valo's avatar Kalle Valo

brcm80211: move under broadcom vendor directory

Part of reorganising wireless drivers directory and Kconfig. Note that I had to
edit Makefiles from subdirectories to use the new location.
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 423e3ce3
...@@ -2390,7 +2390,7 @@ M: Hante Meuleman <meuleman@broadcom.com> ...@@ -2390,7 +2390,7 @@ M: Hante Meuleman <meuleman@broadcom.com>
L: linux-wireless@vger.kernel.org L: linux-wireless@vger.kernel.org
L: brcm80211-dev-list@broadcom.com L: brcm80211-dev-list@broadcom.com
S: Supported S: Supported
F: drivers/net/wireless/brcm80211/ F: drivers/net/wireless/broadcom/brcm80211/
BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER
M: QLogic-Storage-Upstream@qlogic.com M: QLogic-Storage-Upstream@qlogic.com
......
...@@ -159,7 +159,6 @@ config MWL8K ...@@ -159,7 +159,6 @@ config MWL8K
will be called mwl8k. If unsure, say N. will be called mwl8k. If unsure, say N.
source "drivers/net/wireless/ath/Kconfig" source "drivers/net/wireless/ath/Kconfig"
source "drivers/net/wireless/brcm80211/Kconfig"
source "drivers/net/wireless/hostap/Kconfig" source "drivers/net/wireless/hostap/Kconfig"
source "drivers/net/wireless/ipw2x00/Kconfig" source "drivers/net/wireless/ipw2x00/Kconfig"
source "drivers/net/wireless/iwlwifi/Kconfig" source "drivers/net/wireless/iwlwifi/Kconfig"
......
...@@ -47,8 +47,5 @@ obj-$(CONFIG_WL_TI) += ti/ ...@@ -47,8 +47,5 @@ obj-$(CONFIG_WL_TI) += ti/
obj-$(CONFIG_MWIFIEX) += mwifiex/ obj-$(CONFIG_MWIFIEX) += mwifiex/
obj-$(CONFIG_BRCMFMAC) += brcm80211/
obj-$(CONFIG_BRCMSMAC) += brcm80211/
obj-$(CONFIG_CW1200) += cw1200/ obj-$(CONFIG_CW1200) += cw1200/
obj-$(CONFIG_RSI_91X) += rsi/ obj-$(CONFIG_RSI_91X) += rsi/
...@@ -13,5 +13,6 @@ if WLAN_VENDOR_BROADCOM ...@@ -13,5 +13,6 @@ if WLAN_VENDOR_BROADCOM
source "drivers/net/wireless/broadcom/b43/Kconfig" source "drivers/net/wireless/broadcom/b43/Kconfig"
source "drivers/net/wireless/broadcom/b43legacy/Kconfig" source "drivers/net/wireless/broadcom/b43legacy/Kconfig"
source "drivers/net/wireless/broadcom/brcm80211/Kconfig"
endif # WLAN_VENDOR_BROADCOM endif # WLAN_VENDOR_BROADCOM
obj-$(CONFIG_B43) += b43/ obj-$(CONFIG_B43) += b43/
obj-$(CONFIG_B43LEGACY) += b43legacy/ obj-$(CONFIG_B43LEGACY) += b43legacy/
obj-$(CONFIG_BRCMFMAC) += brcm80211/
obj-$(CONFIG_BRCMSMAC) += brcm80211/
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
ccflags-y += \ ccflags-y += \
-Idrivers/net/wireless/brcm80211/brcmfmac \ -Idrivers/net/wireless/broadcom/brcm80211/brcmfmac \
-Idrivers/net/wireless/brcm80211/include -Idrivers/net/wireless/broadcom/brcm80211/include
ccflags-y += -D__CHECK_ENDIAN__ ccflags-y += -D__CHECK_ENDIAN__
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
ccflags-y := \ ccflags-y := \
-D__CHECK_ENDIAN__ \ -D__CHECK_ENDIAN__ \
-Idrivers/net/wireless/brcm80211/brcmsmac \ -Idrivers/net/wireless/broadcom/brcm80211/brcmsmac \
-Idrivers/net/wireless/brcm80211/brcmsmac/phy \ -Idrivers/net/wireless/broadcom/brcm80211/brcmsmac/phy \
-Idrivers/net/wireless/brcm80211/include -Idrivers/net/wireless/broadcom/brcm80211/include
brcmsmac-y := \ brcmsmac-y := \
mac80211_if.o \ mac80211_if.o \
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
ccflags-y := \ ccflags-y := \
-Idrivers/net/wireless/brcm80211/brcmutil \ -Idrivers/net/wireless/broadcom/brcm80211/brcmutil \
-Idrivers/net/wireless/brcm80211/include -Idrivers/net/wireless/broadcom/brcm80211/include
obj-$(CONFIG_BRCMUTIL) += brcmutil.o obj-$(CONFIG_BRCMUTIL) += brcmutil.o
brcmutil-objs = utils.o d11.o brcmutil-objs = utils.o d11.o
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment