From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Thu, 9 Jun 2011 22:03:42 +0000 (+0200)
Subject: compat-wireless: add bcma
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5e0e715871d92321bbc3758d5ae01e1d52de45c7;p=openwrt%2Fstaging%2Fblogic.git

compat-wireless: add bcma

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---

diff --git a/Makefile b/Makefile
index 9e97b506c5c4..9c9529260f9a 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ obj-$(CONFIG_COMPAT_WIRELESS_MODULES) += drivers/net/wireless/
 obj-$(CONFIG_COMPAT_NET_USB_MODULES) += drivers/net/usb/
 
 obj-$(CONFIG_COMPAT_NETWORK_MODULES) += drivers/net/
-obj-$(CONFIG_COMPAT_VAR_MODULES) +=  drivers/ssb/ drivers/misc/eeprom/
+obj-$(CONFIG_COMPAT_VAR_MODULES) +=  drivers/ssb/ drivers/bcma/ drivers/misc/eeprom/
 
 ifeq ($(CONFIG_STAGING_EXCLUDE_BUILD),)
 obj-$(CONFIG_COMPAT_STAGING) += drivers/staging/ath6kl/
diff --git a/config.mk b/config.mk
index da1ebebf53a6..0692c6e00ef6 100644
--- a/config.mk
+++ b/config.mk
@@ -325,6 +325,11 @@ endif #CONFIG_PCMCIA
 CONFIG_SSB_DRIVER_PCICORE=y
 endif #CONFIG_SSB
 
+CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
+CONFIG_BCMA_HOST_PCI=y
+# CONFIG_BCMA_DEBUG=y
+
 CONFIG_P54_PCI=m
 
 CONFIG_B44=m
diff --git a/defconfigs/atheros-debug.mk b/defconfigs/atheros-debug.mk
index fb884aae1c61..285b2316a4d6 100644
--- a/defconfigs/atheros-debug.mk
+++ b/defconfigs/atheros-debug.mk
@@ -325,6 +325,11 @@ endif #CONFIG_PCMCIA
 CONFIG_SSB_DRIVER_PCICORE=y
 endif #CONFIG_SSB
 
+CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
+CONFIG_BCMA_HOST_PCI=y
+# CONFIG_BCMA_DEBUG=y
+
 CONFIG_P54_PCI=m
 
 CONFIG_B44=m
diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh
index df7056e76a0e..7b2d1f8451f9 100755
--- a/scripts/admin-update.sh
+++ b/scripts/admin-update.sh
@@ -220,6 +220,7 @@ DRIVERS="$DRIVERS drivers/net/wireless/ath/carl9170"
 DRIVERS="$DRIVERS drivers/net/wireless/ath/ath5k"
 DRIVERS="$DRIVERS drivers/net/wireless/ath/ath9k"
 DRIVERS="$DRIVERS drivers/ssb"
+DRIVERS="$DRIVERS drivers/bcma"
 DRIVERS="$DRIVERS drivers/net/wireless/b43"
 DRIVERS="$DRIVERS drivers/net/wireless/b43legacy"
 DRIVERS="$DRIVERS drivers/net/wireless/iwlegacy"
@@ -273,6 +274,7 @@ mkdir -p include/linux/ include/net/ include/linux/usb \
 	net/mac80211/ net/wireless/ \
 	net/rfkill/ \
 	drivers/ssb/ \
+	drivers/bcma/ \
 	drivers/net/usb/ \
 	drivers/net/wireless/
 mkdir -p include/net/bluetooth/
@@ -285,6 +287,7 @@ for i in $INCLUDE_LINUX; do
 done
 
 cp -a $GIT_TREE/include/linux/ssb include/linux/
+cp -a $GIT_TREE/include/linux/bcma include/linux/
 cp -a $GIT_TREE/include/linux/rfkill.h include/linux/rfkill_backport.h
 
 # include/net