Fix merge problems

[u-boot] / include / pci_ids.h

diff --git a/include/pci_ids.h b/include/pci_ids.h
index 61c22031e9c33aa06c758dafd5c274a5dd903cfc..165456bc8ccb6976cd42d34a9f7aff31e5d6d1f2 100644 (file)
--- a/include/pci_ids.h
+++ b/include/pci_ids.h
@@ -1812,7 +1812,8 @@
 #define PCI_DEVICE_ID_INTEL_82434      0x04a3
 #define PCI_DEVICE_ID_INTEL_I960       0x0960
 #define PCI_DEVICE_ID_INTEL_I960RM     0x0962
-#define PCI_DEVICE_ID_INTEL_82541ER 0x1078
+#define PCI_DEVICE_ID_INTEL_82541ER    0x1078
+#define PCI_DEVICE_ID_INTEL_82541GI_LF 0x107c
 #define PCI_DEVICE_ID_INTEL_82542      0x1000
 #define PCI_DEVICE_ID_INTEL_82543GC_FIBER      0x1001
 #define PCI_DEVICE_ID_INTEL_82543GC_COPPER     0x1004
@@ -1826,6 +1827,7 @@
 #define PCI_DEVICE_ID_INTEL_82545EM_FIBER      0x1011
 #define PCI_DEVICE_ID_INTEL_82546EB_FIBER      0x1012
 #define PCI_DEVICE_ID_INTEL_82540EM_LOM                0x1015
+#define PCI_DEVICE_ID_INTEL_82545GM_COPPER     0x1026
 #define PCI_DEVICE_ID_INTEL_82559              0x1030
 
 #define PCI_DEVICE_ID_INTEL_82562ET    0x1031