diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-04-04 16:10:36 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-04-04 16:10:36 -0400 |
| commit | 18d6a0f5b6693d630a8da9dfd6cac1ea4e5dccab (patch) | |
| tree | fe8405c00398b6b74d76c7dec61196732a4e33b1 /drivers/net/wireless/iwlwifi/iwl-eeprom.c | |
| parent | 83860c594f65945b1a2c99e84338e1145cd34890 (diff) | |
| parent | 7eaa6a5e964f1ab02d849bda36950c0d30be8ce2 (diff) | |
Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-eeprom.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-eeprom.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c index 833194a2c63..c831a0f2461 100644 --- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c +++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c | |||
| @@ -198,8 +198,6 @@ static int iwlcore_get_nvm_type(struct iwl_priv *priv) | |||
| 198 | case CSR_HW_REV_TYPE_NONE: | 198 | case CSR_HW_REV_TYPE_NONE: |
| 199 | IWL_ERR(priv, "Unknown hardware type\n"); | 199 | IWL_ERR(priv, "Unknown hardware type\n"); |
| 200 | return -ENOENT; | 200 | return -ENOENT; |
| 201 | case CSR_HW_REV_TYPE_3945: | ||
| 202 | case CSR_HW_REV_TYPE_4965: | ||
| 203 | case CSR_HW_REV_TYPE_5300: | 201 | case CSR_HW_REV_TYPE_5300: |
| 204 | case CSR_HW_REV_TYPE_5350: | 202 | case CSR_HW_REV_TYPE_5350: |
| 205 | case CSR_HW_REV_TYPE_5100: | 203 | case CSR_HW_REV_TYPE_5100: |