diff --git a/Makefile b/Makefile index bfa9c6799..367d8ee79 100644 --- a/Makefile +++ b/Makefile @@ -838,7 +838,6 @@ endif USE_LIBPCI := $(if $(call filter_deps,$(DEPENDS_ON_LIBPCI)),yes,no) ifeq ($(USE_LIBPCI), yes) PROGRAMMER_OBJS += pcidev.o -FEATURE_FLAGS += -D'NEED_PCI=1' override CFLAGS += $(CONFIG_LIBPCI_CFLAGS) override LDFLAGS += $(CONFIG_LIBPCI_LDFLAGS) endif diff --git a/meson.build b/meson.build index 5a6bc2ad7..f8ca1d3d0 100644 --- a/meson.build +++ b/meson.build @@ -159,7 +159,6 @@ endif if get_option('pciutils') srcs += 'pcidev.c' deps += dependency('libpci') - cargs += '-DNEED_PCI=1' elif need_libpci error('pciutils is disabled but one or more enabled programmer requires PCI access') endif diff --git a/programmer.h b/programmer.h index 47d2dc31b..86e45f76c 100644 --- a/programmer.h +++ b/programmer.h @@ -115,7 +115,6 @@ struct bitbang_spi_master { unsigned int half_period; }; -#if NEED_PCI == 1 struct pci_dev; struct pci_filter; @@ -141,7 +140,6 @@ struct pci_dev *pcidev_find(uint16_t vendor, uint16_t device); int rpci_write_byte(struct pci_dev *dev, int reg, uint8_t data); int rpci_write_word(struct pci_dev *dev, int reg, uint16_t data); int rpci_write_long(struct pci_dev *dev, int reg, uint32_t data); -#endif #if CONFIG_INTERNAL == 1 struct penable {