summaryrefslogtreecommitdiffstats
path: root/src/Makefile.housekeeping
diff options
context:
space:
mode:
authorMichael Brown2005-04-12 19:56:23 +0200
committerMichael Brown2005-04-12 19:56:23 +0200
commiteb8f730d6335aaf49b216ff519c944ceaf6d2362 (patch)
treeaec4614ba0aa914742868b32c999eea4090deb05 /src/Makefile.housekeeping
parentTie into new boot device framework. (diff)
downloadipxe-eb8f730d6335aaf49b216ff519c944ceaf6d2362.tar.gz
ipxe-eb8f730d6335aaf49b216ff519c944ceaf6d2362.tar.xz
ipxe-eb8f730d6335aaf49b216ff519c944ceaf6d2362.zip
Use pci_{vendor,device}_id instead of just pci_{vendor,device}, to avoid
conflict with pci_device function.
Diffstat (limited to 'src/Makefile.housekeeping')
-rw-r--r--src/Makefile.housekeeping6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping
index 57538bef..bc4cb3c2 100644
--- a/src/Makefile.housekeeping
+++ b/src/Makefile.housekeeping
@@ -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