From 510d94d0c7187e5f17cb99510994975b97294871 Mon Sep 17 00:00:00 2001 From: Wey-Yi Guy Date: Mon, 10 Jan 2011 14:24:28 -0800 Subject: [PATCH] --- yaml --- r: 236782 b: refs/heads/master c: 14a75766f38d44ca715d9e9ccb0a69e065e4a24e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-csr.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8d2738ba5727..0272225035ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 52d8a50c39e95bce686cb5c5da4dbb2f61ffb92b +refs/heads/master: 14a75766f38d44ca715d9e9ccb0a69e065e4a24e diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-csr.h b/trunk/drivers/net/wireless/iwlwifi/iwl-csr.h index b80bf7dff55b..cb77c0fcf3b8 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-csr.h +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-csr.h @@ -300,8 +300,9 @@ #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_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) /* EEPROM REG */