summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Mares <mj@ucw.cz>2008-02-12 10:31:25 +0100
committerMartin Mares <mj@ucw.cz>2008-02-12 10:31:25 +0100
commitf2b31663e67198f49fecb6e9239f529bf8892f3e (patch)
treecc6998b223359e57495939d58c4ef7c5c9028da4
parent4f6b38ca2cba4aaf49d88a689f48b4183e88f604 (diff)
downloadpciutils-f2b31663e67198f49fecb6e9239f529bf8892f3e.tar.gz
The `-P' option has been removed.
-rw-r--r--common.c6
-rw-r--r--pciutils.h11
2 files changed, 2 insertions, 15 deletions
diff --git a/common.c b/common.c
index 77974f3..ed39b87 100644
--- 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 a1d1890..21d46c1 100644
--- 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"