diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-11-24 16:19:24 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-11-24 16:19:24 -0500 |
| commit | d7a066c92394f3e777351de0c903beeb8a08af76 (patch) | |
| tree | f54ce8ac77d32b4c3166b4a2ca92525174a3213b /drivers/ssb | |
| parent | ccb14354017272ddac002e859a2711610b6af174 (diff) | |
| parent | e476a5a41ad67d0e2b4a652820c49a3923eb936b (diff) | |
| download | lwn-d7a066c92394f3e777351de0c903beeb8a08af76.tar.gz lwn-d7a066c92394f3e777351de0c903beeb8a08af76.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/ssb')
| -rw-r--r-- | drivers/ssb/b43_pci_bridge.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ssb/b43_pci_bridge.c b/drivers/ssb/b43_pci_bridge.c index ef9c6a04ad8f..744d3f6e4709 100644 --- a/drivers/ssb/b43_pci_bridge.c +++ b/drivers/ssb/b43_pci_bridge.c @@ -24,6 +24,7 @@ static const struct pci_device_id b43_pci_bridge_tbl[] = { { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4312) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4315) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4318) }, + { PCI_DEVICE(PCI_VENDOR_ID_BCM_GVC, 0x4318) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4319) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4320) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4321) }, |