Merge branch 'next' into arm-port

[people/teissler/ipfire-2.x.git] / lfs / compat-wireless

diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index 71f3bc9f31d510b070e3e8fcd28d6f6c1ba0b4ac..4e97dabf8402624d9e45f1170f0c601af5299867 100644 (file)
--- a/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@ -34,7 +34,7 @@ else
 endif
 endif
 
-VER        = 2.6.39-1-sn
+VER        = 3.0-2
 
 THISAPP    = compat-wireless-$(VER)
 DL_FILE    = compat-wireless-$(VER).tar.bz2
@@ -51,7 +51,7 @@ objects = $(DL_FILE) asix-3.5.0a.tar.bz2
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 asix-3.5.0a.tar.bz2 = $(DL_FROM)/asix-3.5.0a.tar.bz2
 
-$(DL_FILE)_MD5 = ac2b20607d75de8ce2b30b74995383a6
+$(DL_FILE)_MD5 = 7f2d0de30bf9c3e9a941d9e67971e9b3
 asix-3.5.0a.tar.bz2_MD5=cc57513505d3ad1a43b58add91d2bba7
 
 install : $(TARGET)
@@ -97,6 +97,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # Build Updated asix usb-lan driver
        cd $(DIR_APP)/drivers/net/usb && tar xvf $(DIR_DL)/asix-3.5.0a.tar.bz2
 
+ifeq "$(MACHINE_TYPE)" "arm"
+       # B43+B44 driver doesn't build on arm
+       cd $(DIR_APP) && sed -i -e "s|CONFIG_B43=m||g" config.mk
+       cd $(DIR_APP) && sed -i -e "s|CONFIG_B44=m||g" config.mk
+endif
+
        cd $(DIR_APP) && make KLIB=/lib/modules/$(KVER)-$(VERSUFIX) \
                KMODPATH_ARG='INSTALL_MOD_PATH=' KMODDIR=kernel install-modules