diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2011-06-09 22:07:05 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2011-06-09 22:07:05 +0530 |
| commit | 4b28d81a7ed82b906f1fdec0133d597b9cf57f85 (patch) | |
| tree | fc722c2bafb704c0db35599392d8f8dddbb4e36d /drivers/net/wireless/iwlwifi/iwl-agn.c | |
| parent | 114df7d66efd5c23561782f38e97c48fb30d4f5d (diff) | |
| parent | 626a96db11698119a67eeda130488e869aa6f14e (diff) | |
| download | talos-obmc-linux-4b28d81a7ed82b906f1fdec0133d597b9cf57f85.tar.gz talos-obmc-linux-4b28d81a7ed82b906f1fdec0133d597b9cf57f85.zip | |
Merge remote branch 'gpio/ep93xx-dma' into next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 11c6c1169e78..a662adcb2adb 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -3831,11 +3831,11 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { /* 6150 WiFi/WiMax Series */ {IWL_PCI_DEVICE(0x0885, 0x1305, iwl6150_bgn_cfg)}, - {IWL_PCI_DEVICE(0x0885, 0x1306, iwl6150_bgn_cfg)}, + {IWL_PCI_DEVICE(0x0885, 0x1307, iwl6150_bg_cfg)}, {IWL_PCI_DEVICE(0x0885, 0x1325, iwl6150_bgn_cfg)}, - {IWL_PCI_DEVICE(0x0885, 0x1326, iwl6150_bgn_cfg)}, + {IWL_PCI_DEVICE(0x0885, 0x1327, iwl6150_bg_cfg)}, {IWL_PCI_DEVICE(0x0886, 0x1315, iwl6150_bgn_cfg)}, - {IWL_PCI_DEVICE(0x0886, 0x1316, iwl6150_bgn_cfg)}, + {IWL_PCI_DEVICE(0x0886, 0x1317, iwl6150_bg_cfg)}, /* 1000 Series WiFi */ {IWL_PCI_DEVICE(0x0083, 0x1205, iwl1000_bgn_cfg)}, |
