From cd014c8a9d986dbab042b756b78fac05b7008466 Mon Sep 17 00:00:00 2001 From: Wey-Yi Guy Date: Mon, 10 Jan 2011 14:34:38 -0800 Subject: [PATCH] --- yaml --- r: 236783 b: refs/heads/master c: fcdf1f73fe913c5f16b7f0547cc3df1b0796689f h: refs/heads/master i: 236781: 881f91bdeb33050c52091d80411ca703b02785b7 236779: 756bb5b362cb47bcd13ba84df593aeb8889f54c2 236775: d8770507275082ec99990a9571d3543fab1583aa 236767: d89b2330ec6ed0fe8ac2b5fb3c6b394137e0c5c2 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-csr.h | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0272225035ef..173a61ad0c2e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 14a75766f38d44ca715d9e9ccb0a69e065e4a24e +refs/heads/master: fcdf1f73fe913c5f16b7f0547cc3df1b0796689f diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-csr.h b/trunk/drivers/net/wireless/iwlwifi/iwl-csr.h index cb77c0fcf3b8..6c2b2df7ee7e 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-csr.h +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-csr.h @@ -290,7 +290,7 @@ /* HW REV */ -#define CSR_HW_REV_TYPE_MSK (0x00000F0) +#define CSR_HW_REV_TYPE_MSK (0x00001F0) #define CSR_HW_REV_TYPE_3945 (0x00000D0) #define CSR_HW_REV_TYPE_4965 (0x0000000) #define CSR_HW_REV_TYPE_5300 (0x0000020) @@ -303,7 +303,12 @@ #define CSR_HW_REV_TYPE_6150 (0x0000084) #define CSR_HW_REV_TYPE_6x05 (0x00000B0) #define CSR_HW_REV_TYPE_6x30 CSR_HW_REV_TYPE_6x05 -#define CSR_HW_REV_TYPE_NONE (0x00000F0) +#define CSR_HW_REV_TYPE_6x35 CSR_HW_REV_TYPE_6x05 +#define CSR_HW_REV_TYPE_2x30 (0x00000C0) +#define CSR_HW_REV_TYPE_2x00 (0x0000100) +#define CSR_HW_REV_TYPE_200 (0x0000110) +#define CSR_HW_REV_TYPE_230 (0x0000120) +#define CSR_HW_REV_TYPE_NONE (0x00001F0) /* EEPROM REG */ #define CSR_EEPROM_REG_READ_VALID_MSK (0x00000001)