Ship libertas_tf_usb

Ship libertas_tf_usb but only compile it if the distribution
said so. We don't handle the case yet where the user wants to
replace usb8xxx with libertas_tf_usb. We need a script for that,
patches are welcomed.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>

diff --git a/Makefile b/Makefile
index 738321487cfd5ef06781d74b1139d20d4f666fa9..c916737c825e9b527b86aa7ca24034ad7f55b332 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -113,6 +113,8 @@ install: uninstall modules
        @$(MODPROBE) -l ieee80211
        @$(MODPROBE) -l ieee80211_crypt
        @$(MODPROBE) -l libertas_cs
+       @$(MODPROBE) -l libertas_tf
+       @$(MODPROBE) -l libertas_tf_usb
        @$(MODPROBE) -l ub8xxx
        @$(MODPROBE) -l p54_pci
        @$(MODPROBE) -l p54_usb
@@ -172,6 +174,8 @@ uninstall:
        @$(MODPROBE) -l ieee80211
        @$(MODPROBE) -l ieee80211_crypt
        @$(MODPROBE) -l libertas_cs
+       @$(MODPROBE) -l libertas_tf
+       @$(MODPROBE) -l libertas_tf_usb
        @$(MODPROBE) -l mac80211
        @$(MODPROBE) -l ub8xxx
        @$(MODPROBE) -l p54pci

diff --git a/config.mk b/config.mk
index f2be5118e6b4f2e8ddf6ba24b37c0fbb04fca9ae..68e8eec1e65b6e60d8469ce829d7bcc4b2880143 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -230,9 +230,11 @@ CONFIG_SSB_PCICORE_HOSTMODE=n
 # CONFIG_SSB_DRIVER_EXTIF=y
 
 ifneq ($(CONFIG_USB),)
+ifneq ($(LIBERTAS_THINFIRM_USB),m)
 CONFIG_LIBERTAS_USB=m
 NEED_LIBERTAS=y
 endif
+endif
 ifneq ($(CONFIG_PCMCIA),)
 CONFIG_LIBERTAS_CS=m
 NEED_LIBERTAS=y

diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh
index 6a66fbfb83cfd52261dc41c5e736d750dc14e479..dc0a6e2165ef4adee86c0a997a34da9c94a10e3b 100755 (executable)
--- a/scripts/admin-update.sh
+++ b/scripts/admin-update.sh
@@ -58,6 +58,7 @@ DRIVERS="$DRIVERS drivers/net/wireless/zd1211rw"
 DRIVERS="$DRIVERS drivers/net/wireless/libertas"
 DRIVERS="$DRIVERS drivers/net/wireless/p54"
 DRIVERS="$DRIVERS drivers/net/wireless/rtl818x"
+DRIVERS="$DRIVERS drivers/net/wireless/libertas_tf"
 
 # Drivers that belong the the wireless directory
 DRIVER_FILES="adm8211.c  adm8211.h"