diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-07-29 14:43:37 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-07-29 14:43:37 -0400 |
commit | 718803d161936cf347a21a5a1df29c11fbd4978d (patch) | |
tree | 53a8a1c3c37ab8b62219a0c80c2f872417097f54 /drivers/net/wireless/iwlwifi/pcie/drv.c | |
parent | 0ba568d7be1e6b355aa80adcf2c93de41e5c2afc (diff) | |
parent | a53ee0a308b16e392e0219c585b10f329345766b (diff) | |
download | linux-718803d161936cf347a21a5a1df29c11fbd4978d.tar.gz |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes
Diffstat (limited to 'drivers/net/wireless/iwlwifi/pcie/drv.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/pcie/drv.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/pcie/drv.c b/drivers/net/wireless/iwlwifi/pcie/drv.c index 81f3ea5b09a4..ff13458efc27 100644 --- a/drivers/net/wireless/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/iwlwifi/pcie/drv.c @@ -130,6 +130,7 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { {IWL_PCI_DEVICE(0x423C, 0x1306, iwl5150_abg_cfg)}, /* Half Mini Card */ {IWL_PCI_DEVICE(0x423C, 0x1221, iwl5150_agn_cfg)}, /* Mini Card */ {IWL_PCI_DEVICE(0x423C, 0x1321, iwl5150_agn_cfg)}, /* Half Mini Card */ + {IWL_PCI_DEVICE(0x423C, 0x1326, iwl5150_abg_cfg)}, /* Half Mini Card */ {IWL_PCI_DEVICE(0x423D, 0x1211, iwl5150_agn_cfg)}, /* Mini Card */ {IWL_PCI_DEVICE(0x423D, 0x1311, iwl5150_agn_cfg)}, /* Half Mini Card */ |