aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-02-17 18:27:42 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-02-17 18:27:42 +0000
commit47a82d2dad266b8247e3796ac461cbe5caaf7ec5 (patch)
tree47d0eef5aa22d6d16bcf5fd4bb4f5a3fdc3330b3
parent83529be80a5f2630222df4421a06e7e8c0ad2cc1 (diff)
downloadmaster-187ad058-47a82d2dad266b8247e3796ac461cbe5caaf7ec5.tar.gz
master-187ad058-47a82d2dad266b8247e3796ac461cbe5caaf7ec5.tar.bz2
master-187ad058-47a82d2dad266b8247e3796ac461cbe5caaf7ec5.zip
carl9170: update to version 1.0.1.1 and fix a compile error
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19691 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/carl9170/Makefile4
-rw-r--r--package/carl9170/patches/120-compile_fix.patch13
2 files changed, 15 insertions, 2 deletions
diff --git a/package/carl9170/Makefile b/package/carl9170/Makefile
index a272924862..8238389867 100644
--- a/package/carl9170/Makefile
+++ b/package/carl9170/Makefile
@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=carl9170
-PKG_VERSION:=0.9.9.1
+PKG_VERSION:=1.0.1.1
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/chr/carl9170/$(PKG_VERSION) \
@KERNEL/linux/kernel/people/chr/carl9170/old/$(PKG_VERSION)
-PKG_MD5SUM:=122610b254125d93c7f64cc559d3341a
+PKG_MD5SUM:=8abbb4ae09a45a82af6f63cb65c7e2d8
include $(INCLUDE_DIR)/package.mk
diff --git a/package/carl9170/patches/120-compile_fix.patch b/package/carl9170/patches/120-compile_fix.patch
new file mode 100644
index 0000000000..00f0fba847
--- /dev/null
+++ b/package/carl9170/patches/120-compile_fix.patch
@@ -0,0 +1,13 @@
+--- a/drivers/net/wireless/ath/carl9170/fw.c
++++ b/drivers/net/wireless/ath/carl9170/fw.c
+@@ -185,8 +185,10 @@ static int ar9170_fw_check(struct ar9170
+ if (SUPP(CARL9170FW_WLANTX_CAB))
+ ar->hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_AP);
+
++#ifdef CONFIG_CARL9170_WPS_BUTTON
+ if (!SUPP(CARL9170FW_GPIO_INTERRUPT))
+ ar->has_wps_button = false;
++#endif
+
+ #undef SUPPORTED
+ return 0;