]>
Commit | Line | Data |
---|---|---|
9f934a63 GKH |
1 | From 1d8638d4038eb8709edc80e37a0bbb77253d86e9 Mon Sep 17 00:00:00 2001 |
2 | From: Daniel Klaffenbach <danielklaffenbach@gmail.com> | |
3 | Date: Fri, 19 Nov 2010 21:25:21 -0600 | |
4 | Subject: ssb: b43-pci-bridge: Add new vendor for BCM4318 | |
5 | ||
6 | From: Daniel Klaffenbach <danielklaffenbach@gmail.com> | |
7 | ||
8 | commit 1d8638d4038eb8709edc80e37a0bbb77253d86e9 upstream. | |
9 | ||
10 | Add new vendor for Broadcom 4318. | |
11 | ||
12 | Signed-off-by: Daniel Klaffenbach <danielklaffenbach@gmail.com> | |
13 | Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> | |
14 | Signed-off-by: John W. Linville <linville@tuxdriver.com> | |
15 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
16 | ||
17 | --- | |
18 | drivers/ssb/b43_pci_bridge.c | 1 + | |
19 | include/linux/pci_ids.h | 1 + | |
20 | 2 files changed, 2 insertions(+) | |
21 | ||
22 | --- a/drivers/ssb/b43_pci_bridge.c | |
23 | +++ b/drivers/ssb/b43_pci_bridge.c | |
24 | @@ -24,6 +24,7 @@ static const struct pci_device_id b43_pc | |
25 | { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4312) }, | |
26 | { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4315) }, | |
27 | { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4318) }, | |
28 | + { PCI_DEVICE(PCI_VENDOR_ID_BCM_GVC, 0x4318) }, | |
29 | { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4319) }, | |
30 | { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4320) }, | |
31 | { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4321) }, | |
32 | --- a/include/linux/pci_ids.h | |
33 | +++ b/include/linux/pci_ids.h | |
34 | @@ -2041,6 +2041,7 @@ | |
35 | #define PCI_DEVICE_ID_AFAVLAB_P030 0x2182 | |
36 | #define PCI_SUBDEVICE_ID_AFAVLAB_P061 0x2150 | |
37 | ||
38 | +#define PCI_VENDOR_ID_BCM_GVC 0x14a4 | |
39 | #define PCI_VENDOR_ID_BROADCOM 0x14e4 | |
40 | #define PCI_DEVICE_ID_TIGON3_5752 0x1600 | |
41 | #define PCI_DEVICE_ID_TIGON3_5752M 0x1601 |