The `-P' option has been removed.

diff --git a/common.c b/common.c
index 77974f314f5fca7f736d2c356465b40b0d8fc1c2..ed39b87148f6c726178f206f460c39c39975c56f 100644 (file)
--- a/common.c
+++ b/common.c
@@ -94,12 +94,6 @@ parse_generic_option(int i, struct pci_access *pacc, char *optarg)
 {
   switch (i)
     {
-#ifdef PCI_HAVE_PM_LINUX_PROC
-    case 'P':
-      pci_set_param(pacc, "proc.path", optarg);
-      pacc->method = PCI_ACCESS_PROC_BUS_PCI;
-      break;
-#endif
 #ifdef PCI_HAVE_PM_INTEL_CONF
     case 'H':
       if (!strcmp(optarg, "1"))

diff --git a/pciutils.h b/pciutils.h
index a1d18904bbf5492ab59910fe677019273ffd1ff4..21d46c13896cda0b03f158525bf0562f88a32a36 100644 (file)
--- a/pciutils.h
+++ b/pciutils.h
@@ -22,13 +22,6 @@ void *xmalloc(unsigned int howmuch);
 void *xrealloc(void *ptr, unsigned int howmuch);
 int parse_generic_option(int i, struct pci_access *pacc, char *optarg);
 
-#ifdef PCI_HAVE_PM_LINUX_PROC
-#define GENOPT_PROC "P:"
-#define GENHELP_PROC "-P <dir>\tUse specified directory instead of " PCI_PATH_PROC_BUS_PCI "\n"
-#else
-#define GENOPT_PROC
-#define GENHELP_PROC
-#endif
 #ifdef PCI_HAVE_PM_INTEL_CONF
 #define GENOPT_INTEL "H:"
 #define GENHELP_INTEL "-H <mode>\tUse direct hardware access (<mode> = 1 or 2)\n"
@@ -44,8 +37,8 @@ int parse_generic_option(int i, struct pci_access *pacc, char *optarg);
 #define GENHELP_DUMP
 #endif
 
-#define GENERIC_OPTIONS "A:GO:" GENOPT_PROC GENOPT_INTEL GENOPT_DUMP
-#define GENERIC_HELP GENHELP_PROC GENHELP_INTEL GENHELP_DUMP \
+#define GENERIC_OPTIONS "A:GO:" GENOPT_INTEL GENOPT_DUMP
+#define GENERIC_HELP GENHELP_INTEL GENHELP_DUMP \
        "-A <method>\tUse the specified PCI access method (see `-A help' for a list)\n" \
        "-G\t\tEnable PCI access debugging\n" \
        "-O <par>=<val>\tSet PCI access parameter (see `-O help' for a list)\n"