diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-03 12:41:58 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-03 12:41:58 -0800 |
| commit | 1725d409caba16ea5fc694bd50e95e79e8ced11a (patch) | |
| tree | 688fe26dd4ceda5364692f0ce307aadb6f04f331 /drivers/ssb/b43_pci_bridge.c | |
| parent | b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15 (diff) | |
| parent | b8abde45d7d6ab9e8ceced9b5990eeb1149d0b97 (diff) | |
| download | talos-obmc-linux-1725d409caba16ea5fc694bd50e95e79e8ced11a.tar.gz talos-obmc-linux-1725d409caba16ea5fc694bd50e95e79e8ced11a.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/ssb/b43_pci_bridge.c')
| -rw-r--r-- | drivers/ssb/b43_pci_bridge.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/ssb/b43_pci_bridge.c b/drivers/ssb/b43_pci_bridge.c index 2d27d6d6d08e..27a677584a4c 100644 --- a/drivers/ssb/b43_pci_bridge.c +++ b/drivers/ssb/b43_pci_bridge.c @@ -21,6 +21,7 @@ static const struct pci_device_id b43_pci_bridge_tbl[] = { { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4307) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4311) }, { 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_BROADCOM, 0x4319) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4320) }, @@ -29,6 +30,7 @@ static const struct pci_device_id b43_pci_bridge_tbl[] = { { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4325) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4328) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4329) }, + { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x432b) }, { 0, }, }; MODULE_DEVICE_TABLE(pci, b43_pci_bridge_tbl); |
