compat-wireless: Fix b44 build issues.
authorTim Gardner <timg@tpi.com>
Wed, 30 Sep 2009 17:00:00 +0000 (11:00 -0600)
committerLuis R. Rodriguez <lrodriguez@atheros.com>
Wed, 30 Sep 2009 19:10:51 +0000 (12:10 -0700)
Even though CONFIG_B44 is defined, there is no Makefile
created in drivers/net. This failure to build allows the
in-kernel version of b44 to get loaded with a compat-wireless
version of ssb.ko, never a good thing.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Makefile
scripts/admin-update.sh

index c7333a293bda31a4103dd31f657b75748e5cf0d6..fa9aadc7942636baaaf43f488c03cbc1ab030210 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,7 @@ ifeq ($(ONLY_CORE),)
 obj-m += \
        drivers/ssb/ \
        drivers/misc/eeprom/ \
+       drivers/net/ \
        drivers/net/usb/ \
        drivers/net/wireless/
 endif
index c65952db76ae87887ee6fa7f1b07ec3cccd95bbb..cb42fe72f78a49c593dad38587c9b9524af954cb 100755 (executable)
@@ -149,6 +149,7 @@ done
 # b44 is dependent on ssb, so its has to be rebuilt as well.
 DIR="drivers/net"
 cp $GIT_TREE/$DIR/b44.[ch] $DIR
+echo "obj-m += b44.o" > $DIR/Makefile
 
 # Misc
 mkdir -p drivers/misc/eeprom/