summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/iwlwifi/iwl-csr.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-07-14 01:25:13 +0400
committerDavid S. Miller <davem@davemloft.net>2010-07-14 01:25:13 +0400
commitfae88f7eedae42c955075aec7a0cd27545f81511 (patch)
treea14895b1d5d5881dfb9eddb23a2ab270e14dc4a7 /drivers/net/wireless/iwlwifi/iwl-csr.h
parent1e2cfeef060fa0270f9a2d66b1218c12c05062e0 (diff)
parente300d955debdadf599c36e47eb0bc16f5976215c (diff)
downloadlinux-fae88f7eedae42c955075aec7a0cd27545f81511.tar.xz
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-csr.h')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-csr.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-csr.h b/drivers/net/wireless/iwlwifi/iwl-csr.h
index 254c35ae8b38..ecf98e7ac4ed 100644
--- a/drivers/net/wireless/iwlwifi/iwl-csr.h
+++ b/drivers/net/wireless/iwlwifi/iwl-csr.h
@@ -298,6 +298,7 @@
#define CSR_HW_REV_TYPE_1000 (0x0000060)
#define CSR_HW_REV_TYPE_6x00 (0x0000070)
#define CSR_HW_REV_TYPE_6x50 (0x0000080)
+#define CSR_HW_REV_TYPE_6x50g2 (0x0000084)
#define CSR_HW_REV_TYPE_6x00g2 (0x00000B0)
#define CSR_HW_REV_TYPE_NONE (0x00000F0)