carl9170: update to version 1.0.1.1 and fix a compile error

SVN-Revision: 19691
This commit is contained in:
Felix Fietkau 2010-02-17 18:27:42 +00:00
parent dd4893f453
commit 1797c1217b
2 changed files with 15 additions and 2 deletions

View file

@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=carl9170 PKG_NAME:=carl9170
PKG_VERSION:=0.9.9.1 PKG_VERSION:=1.0.1.1
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/chr/carl9170/$(PKG_VERSION) \ PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/chr/carl9170/$(PKG_VERSION) \
@KERNEL/linux/kernel/people/chr/carl9170/old/$(PKG_VERSION) @KERNEL/linux/kernel/people/chr/carl9170/old/$(PKG_VERSION)
PKG_MD5SUM:=122610b254125d93c7f64cc559d3341a PKG_MD5SUM:=8abbb4ae09a45a82af6f63cb65c7e2d8
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

View file

@ -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;