Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx> --- Makefile | 2 +- config.mk | 5 +++++ defconfigs/atheros-debug.mk | 5 +++++ scripts/admin-update.sh | 3 +++ 4 files changed, 14 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 9e97b50..9c95292 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 da1ebeb..0692c6e 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 fb884aa..285b231 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 df7056e..7b2d1f8 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 -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
