From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 6 Jun 2013 08:58:22 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=86fa8e6b1add1648012fcc656c0eaee9187ab364;hp=3bf629e8baaf61d89db9832efd95fb5db903e542

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
---

diff --git a/lfs/compat-drivers b/lfs/compat-drivers
index 57ce83c85..f23a6fc3c 100644
--- a/lfs/compat-drivers
+++ b/lfs/compat-drivers
@@ -42,14 +42,14 @@ TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) asix-4.5.0a.tar.xz asix_gb-1.4.0a.tar.xz
+objects = $(DL_FILE) asix-4.7.0a.tar.xz asix_gb-1.4.0a.tar.xz
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-asix-4.5.0a.tar.xz = $(DL_FROM)/asix-4.5.0a.tar.xz
+asix-4.7.0a.tar.xz = $(DL_FROM)/asix-4.7.0a.tar.xz
 asix_gb-1.4.0a.tar.xz = $(DL_FROM)/asix_gb-1.4.0a.tar.xz
 
 $(DL_FILE)_MD5 = 5a1e27e5b694aa5022116a5a3220bfdc
-asix-4.5.0a.tar.xz_MD5=4219ce7c0cae4fdb580f30ea50cad8e0
+asix-4.7.0a.tar.xz_MD5=491f7e8c3ee74433975812d86a0fa98b
 asix_gb-1.4.0a.tar.xz_MD5=9c9db731631abf00da2069d03253f9a7
 
 install : $(TARGET)
@@ -100,7 +100,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-2.6.34-usbnet_compile.patch
 
 	# Build Updated asix usb lan driver
-	cd $(DIR_APP)/drivers/net/usb && tar xvJf $(DIR_DL)/asix-4.5.0a.tar.xz
+	cd $(DIR_APP)/drivers/net/usb && tar xvJf $(DIR_DL)/asix-4.7.0a.tar.xz
 
 	# Build Updated asix usb gigabit lan driver
 	cd $(DIR_APP)/drivers/net/usb && tar xvJf $(DIR_DL)/asix_gb-1.4.0a.tar.xz