Message ID | 1368604878-25807-1-git-send-email-adam.lee@canonical.com |
---|---|
State | New |
Headers | show |
simple cherry pick of pci id
On Wed, May 15, 2013 at 04:01:17PM +0800, Adam Lee wrote: > From: Shuduo Sang <sangshuduo@gmail.com> > > BugLink: http://bugs.launchpad.net/bugs/1180256 > > some new thinkpad laptops use intel chip with new pci id need be added > lspci -vnn output: > Network controller [0280]: Intel Corporation Centrino Advanced-N 6235 > [8086:088f] (rev 24) > Subsystem: Intel Corporation Device [8086:5260] > > Signed-off-by: Shuduo Sang <sangshuduo@gmail.com> > Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> > Signed-off-by: Johannes Berg <johannes.berg@intel.com> > (backported from commit 20ecf9fd3bebc4147e2996c08a75d6f0229b90df) > Signed-off-by: Adam Lee <adam.lee@canonical.com> > --- > drivers/net/wireless/iwlwifi/iwl-pci.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/net/wireless/iwlwifi/iwl-pci.c b/drivers/net/wireless/iwlwifi/iwl-pci.c > index 0c8a1c2..6382677 100644 > --- a/drivers/net/wireless/iwlwifi/iwl-pci.c > +++ b/drivers/net/wireless/iwlwifi/iwl-pci.c > @@ -243,6 +243,7 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { > {IWL_PCI_DEVICE(0x088F, 0x4260, iwl6035_2agn_cfg)}, > {IWL_PCI_DEVICE(0x088E, 0x4460, iwl6035_2agn_cfg)}, > {IWL_PCI_DEVICE(0x088E, 0x4860, iwl6035_2agn_cfg)}, > + {IWL_PCI_DEVICE(0x088E, 0x5260, iwl6035_2agn_cfg)}, > > /* 105 Series */ > {IWL_PCI_DEVICE(0x0894, 0x0022, iwl105_bgn_cfg)}, > -- > 1.7.10.4 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team This is also a good candidate for stable kernels. Cheers, -- Luis
diff --git a/drivers/net/wireless/iwlwifi/iwl-pci.c b/drivers/net/wireless/iwlwifi/iwl-pci.c index 0c8a1c2..6382677 100644 --- a/drivers/net/wireless/iwlwifi/iwl-pci.c +++ b/drivers/net/wireless/iwlwifi/iwl-pci.c @@ -243,6 +243,7 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { {IWL_PCI_DEVICE(0x088F, 0x4260, iwl6035_2agn_cfg)}, {IWL_PCI_DEVICE(0x088E, 0x4460, iwl6035_2agn_cfg)}, {IWL_PCI_DEVICE(0x088E, 0x4860, iwl6035_2agn_cfg)}, + {IWL_PCI_DEVICE(0x088E, 0x5260, iwl6035_2agn_cfg)}, /* 105 Series */ {IWL_PCI_DEVICE(0x0894, 0x0022, iwl105_bgn_cfg)},