summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--NEWS3
-rwxr-xr-xgenerate_pciclass.pl2
3 files changed, 5 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 85469bc..8e536a5 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ libldetect.a: $(lib_objs)
ar -cru $@ $^
ranlib $@
-pciclass.c: /usr/include/linux/pci.h /usr/include/linux/pci_ids.h
+pciclass.c: /usr/include/pci/pci.h /usr/include/pci/header.h
rm -f $@
perl generate_pciclass.pl $^ > $@
chmod a-w $@
diff --git a/NEWS b/NEWS
index 4c7bad1..874da48 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- generate PCI classes info using ids from pcutils header instead of deprecated
+ kernel header (Andrey Bondrov)
+
Version 0.12.1 - 19 January 2012, Thierry Vignaud
- do not ignore /etc/modprobe.d/*
diff --git a/generate_pciclass.pl b/generate_pciclass.pl
index 948431d..363d52a 100755
--- a/generate_pciclass.pl
+++ b/generate_pciclass.pl
@@ -8,7 +8,7 @@ static struct {
} classes[] = {
);
-/^#define PCI_CLASS_(\w+)\s+(0x\w{4})/ and print qq( { $2, "$1" },\n) while <>;
+/^#define\s+PCI_CLASS_(\w+)\s+(0x\w{4})/ and print qq( { $2, "$1" },\n) while <>;
print '
};