compat-wireless: add bcma

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

diff --git a/Makefile b/Makefile
index 9e97b506c5c4d7be4b92cb9c1e9880bb0bdbfe04..9c9529260f9ac0e8827b53bfe6b8f20f9093e741 100644 (file)
--- 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 da1ebebf53a671d5c985687ce0cae6e4c199f235..0692c6e00ef6dd4ca3a264563ccf84d835d14864 100644 (file)
--- 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 fb884aae1c61e777ffa8ebb7923ffef95b2c521f..285b2316a4d6c1163dbb1b5a7bfd251a0d99e001 100644 (file)
--- 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 df7056e76a0e9c31f3b438a215186300e9d9db80..7b2d1f8451f9981d57a823c0d20447d7fedd203b 100755 (executable)
--- 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