diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-10-11 20:41:19 +0200 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-10-11 20:41:19 +0200 |
commit | 4af6600fd793023c01634cca5abfe4a2b707788f (patch) | |
tree | 9e3a830d7782512b492011932ddd789d13a900c4 /drivers/ssb/b43_pci_bridge.c | |
parent | Merge branch 'next' into for-linus (diff) | |
parent | Input: i8042 - disable active multiplexing by default (diff) | |
download | linux-4af6600fd793023c01634cca5abfe4a2b707788f.tar.xz linux-4af6600fd793023c01634cca5abfe4a2b707788f.zip |
Merge branch 'next' into for-linus
Prepare second round of input updates for 3.18.
Diffstat (limited to 'drivers/ssb/b43_pci_bridge.c')
-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 19396dc4ee47..bed2fedeb057 100644 --- a/drivers/ssb/b43_pci_bridge.c +++ b/drivers/ssb/b43_pci_bridge.c @@ -38,6 +38,7 @@ static const struct pci_device_id b43_pci_bridge_tbl[] = { { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x432b) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x432c) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4350) }, + { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4351) }, { 0, }, }; MODULE_DEVICE_TABLE(pci, b43_pci_bridge_tbl); |