Use pci_{vendor,device}_id instead of just pci_{vendor,device}, to avoid
authorMichael Brown <mcb30@etherboot.org>
Tue, 12 Apr 2005 17:56:23 +0000 (17:56 +0000)
committerMichael Brown <mcb30@etherboot.org>
Tue, 12 Apr 2005 17:56:23 +0000 (17:56 +0000)
conflict with pci_device function.

src/Makefile.housekeeping

index 57538be..bc4cb3c 100644 (file)
@@ -190,12 +190,12 @@ TGT_PCI_DEVICE    = $(PCI_DEVICE_$(TGT_ROM_NAME))
 # TGT_LD_PREFIX  : symbols to require in order to drag in the relevant prefix
 #                 (e.g. "obj_zpciprefix")
 # TGT_LD_IDS :     symbols to define in order to fill in ID structures in the
-#                 ROM header (e.g. "pci_vendor=0x1186 pci_device=0x1300")
+#                 ROM header (e.g."pci_vendor_id=0x1186 pci_device_id=0x1300")
 #
 TGT_LD_DRIVERS = $(subst -,_,$(patsubst %,obj_%,$(TGT_DRIVERS)))
 TGT_LD_PREFIX  = obj_$(subst rom,$(TGT_ROM_TYPE),$(TGT_PREFIX))prefix
-TGT_LD_IDS     = $(if $(TGT_PCI_VENDOR),pci_vendor=$(TGT_PCI_VENDOR)) \
-                 $(if $(TGT_PCI_DEVICE),pci_device=$(TGT_PCI_DEVICE))
+TGT_LD_IDS     = $(if $(TGT_PCI_VENDOR),pci_vendor_id=$(TGT_PCI_VENDOR)) \
+                 $(if $(TGT_PCI_DEVICE),pci_device_id=$(TGT_PCI_DEVICE))
 
 # Calculate linker flags based on link-time options for the current
 # target type (e.g. "bin/dfe538--prism2_pci.zrom.tmp") and derive the