summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-05-14 13:19:56 +0000
committerThierry Vignaud <tv@mandriva.org>2008-05-14 13:19:56 +0000
commita32b32bd9a2c443eb39d3572db6278940175280f (patch)
tree1fa40d78d0855c8b7a13ec7d749b294d02e047c4
parent1db358bb9d8af98c1e0b0df13e3d2e42aa92c9a5 (diff)
downloadldetect-a32b32bd9a2c443eb39d3572db6278940175280f.tar
ldetect-a32b32bd9a2c443eb39d3572db6278940175280f.tar.gz
ldetect-a32b32bd9a2c443eb39d3572db6278940175280f.tar.bz2
ldetect-a32b32bd9a2c443eb39d3572db6278940175280f.tar.xz
ldetect-a32b32bd9a2c443eb39d3572db6278940175280f.zip
(pci_probe) adapt to pciutils-3.x API
-rw-r--r--Makefile2
-rw-r--r--pci.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 6085ca4..24fd2c3 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ build: $(binaries) $(libraries)
lspcidrake: lspcidrake.c libldetect.so
$(lib_major).$(LIB_MINOR): $(lib_objs)
- $(CC) -shared -z relro -Wl,-O1,-soname,$(lib_major) -o $@ $^ -lpci -lmodprobe -lz
+ $(CC) -shared -Wl,-z,relro -Wl,-O1,-soname,$(lib_major) -o $@ $^ -lpci -lmodprobe -lz
$(lib_major): $(lib_major).$(LIB_MINOR)
ln -sf $< $@
libldetect.so: $(lib_major)
diff --git a/pci.c b/pci.c
index d9f516a..6ed016b 100644
--- a/pci.c
+++ b/pci.c
@@ -40,8 +40,7 @@ extern struct pciusb_entries pci_probe(void) {
pacc = pci_alloc();
if (proc_pci_path) {
- pacc->method_params[PCI_ACCESS_PROC_BUS_PCI] = proc_pci_path;
- pacc->method = PCI_ACCESS_PROC_BUS_PCI;
+ pci_set_param(pacc, "proc.path", proc_pci_path);
}