Fix merge problems

[u-boot] / include / pci_ids.h

diff --git a/include/pci_ids.h b/include/pci_ids.h
index d061017911598a0265727ba90542102b5ab0988c..165456bc8ccb6976cd42d34a9f7aff31e5d6d1f2 100644 (file)
--- a/include/pci_ids.h
+++ b/include/pci_ids.h
@@ -1827,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