aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-11-24 09:16:14 -0800
committerDavid S. Miller <davem@davemloft.net>2010-11-24 09:16:14 -0800
commit66fc5dff5e4f82c92723202a5de9bdec16a9331f (patch)
tree4c9d2e740db2316d73c1e6bed3d6bb08cb052a73 /include
parent9915672d41273f5b77f1b3c29b391ffb7732b84b (diff)
parente476a5a41ad67d0e2b4a652820c49a3923eb936b (diff)
downloadmrst-s0i3-test-66fc5dff5e4f82c92723202a5de9bdec16a9331f.tar.gz
mrst-s0i3-test-66fc5dff5e4f82c92723202a5de9bdec16a9331f.tar.xz
mrst-s0i3-test-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.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index c6bcfe93b9c..32bd5694960 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