From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 8 Feb 2013 18:16:17 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.9-rc1~139^2~132^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=f5237f278f30a92401539a54f87ee0c717b6f818;p=linux.git

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
---

f5237f278f30a92401539a54f87ee0c717b6f818
diff --cc drivers/net/wireless/ti/wlcore/wlcore_i.h
index 5ce26cf402fc,20316ac328a2..910f8e2e556a
--- a/drivers/net/wireless/ti/wlcore/wlcore_i.h
+++ b/drivers/net/wireless/ti/wlcore/wlcore_i.h
@@@ -109,22 -109,11 +109,11 @@@ enum 
  	NUM_FW_VER
  };
  
- #define FW_VER_CHIP_WL127X 6
- #define FW_VER_CHIP_WL128X 7
- 
- #define FW_VER_IF_TYPE_STA 1
- #define FW_VER_IF_TYPE_AP  2
- 
- #define FW_VER_MINOR_1_SPARE_STA_MIN 58
- #define FW_VER_MINOR_1_SPARE_AP_MIN  47
- 
- #define FW_VER_MINOR_FWLOG_STA_MIN 70
- 
  struct wl1271_chip {
  	u32 id;
 -	char fw_ver_str[ETHTOOL_BUSINFO_LEN];
 +	char fw_ver_str[ETHTOOL_FWVERS_LEN];
  	unsigned int fw_ver[NUM_FW_VER];
 -	char phy_fw_ver_str[ETHTOOL_BUSINFO_LEN];
 +	char phy_fw_ver_str[ETHTOOL_FWVERS_LEN];
  };
  
  #define NUM_TX_QUEUES              4