b44 is dependent on ssb.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/Makefile b/Makefile
index d98198591c2603d20c36746d4183b7481cb39c93..c0ccbd5c94e17f7d5202c93545294ca242f67cb4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,7 @@ NOSTDINC_FLAGS := -I$(M)/include/ -include $(M)/include/net/compat.h $(CFLAGS)
 
 obj-y := net/wireless/ net/mac80211/
 ifeq ($(ONLY_CORE),)
+obj-$(CONFIG_B44) += drivers/net/b44.o
 obj-y += net/ieee80211/ \
        drivers/ssb/ \
        drivers/misc/ \

diff --git a/config.mk b/config.mk
index d97b61e2e94671e4b42bc8d861c15173b3fe0c40..dd13efa5311534106ae235ae296b368474cb4ea4 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -128,6 +128,8 @@ CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
 CONFIG_SSB_DRIVER_PCICORE=y
 CONFIG_SSB_B43_PCI_BRIDGE=y
 
+CONFIG_B44=m
+
 CONFIG_RTL8180=m
 CONFIG_ADM8211=m
 

diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh
index 65ad035b2094dcaeeecb3d31b30b75921519debe..0e5d9d89efd7ee5e48059a963ff2dbb18dfe0202 100755 (executable)
--- a/scripts/admin-update.sh
+++ b/scripts/admin-update.sh
@@ -126,6 +126,10 @@ for i in $RNDIS_REQS; do
        cp $GIT_TREE/$DIR/$i $DIR/
 done
 
+# b44 is dependent on ssb, so its has to be rebuilt as well.
+DIR="drivers/net"
+cp $GIT_TREE/$DIR/b44.[ch] $DIR
+
 # Misc
 mkdir -p drivers/misc/
 cp $GIT_TREE/drivers/misc/eeprom_93cx6.c drivers/misc/