diff options
| author | David S. Miller <davem@davemloft.net> | 2010-11-24 18:16:14 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-24 18:16:14 +0100 |
| commit | 66fc5dff5e4f82c92723202a5de9bdec16a9331f (patch) | |
| tree | 4c9d2e740db2316d73c1e6bed3d6bb08cb052a73 /include | |
| parent | af_unix: limit unix_tot_inflight (diff) | |
| parent | wireless: b43: fix error path in SDIO (diff) | |
| download | linux-66fc5dff5e4f82c92723202a5de9bdec16a9331f.tar.xz linux-66fc5dff5e4f82c92723202a5de9bdec16a9331f.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pci_ids.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index c6bcfe93b9ca..32bd56949604 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2047,6 +2047,7 @@ #define PCI_DEVICE_ID_AFAVLAB_P030 0x2182 #define PCI_SUBDEVICE_ID_AFAVLAB_P061 0x2150 +#define PCI_VENDOR_ID_BCM_GVC 0x14a4 #define PCI_VENDOR_ID_BROADCOM 0x14e4 #define PCI_DEVICE_ID_TIGON3_5752 0x1600 #define PCI_DEVICE_ID_TIGON3_5752M 0x1601 |