Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

[android-x86/kernel.git] / include / linux / pci_ids.h

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index c8fdcad..555a826 100644 (file)
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1988,6 +1988,8 @@
 
 #define PCI_VENDOR_ID_SAMSUNG          0x144d
 
+#define PCI_VENDOR_ID_GIGABYTE         0x1458
+
 #define PCI_VENDOR_ID_AMBIT            0x1468
 
 #define PCI_VENDOR_ID_MYRICOM          0x14c1
@@ -2066,7 +2068,6 @@
 #define PCI_DEVICE_ID_TIGON3_5787M     0x1693
 #define PCI_DEVICE_ID_TIGON3_5782      0x1696
 #define PCI_DEVICE_ID_TIGON3_5784      0x1698
-#define PCI_DEVICE_ID_TIGON3_5785      0x1699
 #define PCI_DEVICE_ID_TIGON3_5786      0x169a
 #define PCI_DEVICE_ID_TIGON3_5787      0x169b
 #define PCI_DEVICE_ID_TIGON3_5788      0x169c