diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-29 21:44:22 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-29 21:44:22 +0300 |
commit | 8d7ee9c498e29026aa2a99db40c0032bfe2d4fdf (patch) | |
tree | d4933996296141103b1f54e563268b23c95d6dd4 /drivers/net/wireless/ath/ath9k/reg.h | |
parent | 412dc7f368bf10a8049a8a4c41abbfd0108742e7 (diff) | |
parent | 72083646528d4887b920deb71b37e09bc7d227bb (diff) | |
download | linux-8d7ee9c498e29026aa2a99db40c0032bfe2d4fdf.tar.xz |
Merge branch 'master' into work
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/reg.h')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/reg.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/reg.h b/drivers/net/wireless/ath/ath9k/reg.h index fa05b711e5cd..dddf579aacf1 100644 --- a/drivers/net/wireless/ath/ath9k/reg.h +++ b/drivers/net/wireless/ath/ath9k/reg.h @@ -866,7 +866,13 @@ #define AR_DEVID_7010(_ah) \ (((_ah)->hw_version.devid == 0x7010) || \ ((_ah)->hw_version.devid == 0x7015) || \ - ((_ah)->hw_version.devid == 0x9018)) + ((_ah)->hw_version.devid == 0x9018) || \ + ((_ah)->hw_version.devid == 0xA704) || \ + ((_ah)->hw_version.devid == 0x1200)) + +#define AR9287_HTC_DEVID(_ah) \ + (((_ah)->hw_version.devid == 0x7015) || \ + ((_ah)->hw_version.devid == 0x1200)) #define AR_RADIO_SREV_MAJOR 0xf0 #define AR_RAD5133_SREV_MAJOR 0xc0 |