From 29a898d7edf8152528c68ed2a6acf4216803ffcc Mon Sep 17 00:00:00 2001
From: Theo de Raadt <deraadt@cvs.openbsd.org>
Date: Fri, 5 Jun 2009 19:19:03 +0000
Subject: Allow pcidump -xxv to work (show all the info) ok phessler

---
 usr.sbin/pcidump/pcidump.8 | 7 ++++---
 usr.sbin/pcidump/pcidump.c | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/usr.sbin/pcidump/pcidump.8 b/usr.sbin/pcidump/pcidump.8
index 04995312021..6602bc86c82 100644
--- a/usr.sbin/pcidump/pcidump.8
+++ b/usr.sbin/pcidump/pcidump.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pcidump.8,v 1.7 2008/10/07 09:23:32 dlg Exp $
+.\"	$OpenBSD: pcidump.8,v 1.8 2009/06/05 19:19:02 deraadt Exp $
 .\"
 .\" Copyright (c) 2007 Paul de Weerd <weerd@weirdnet.nl>
 .\"
@@ -14,7 +14,7 @@
 .\" TORTIOUS ACTION, ARISING OUT OF
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: October 7 2008 $
+.Dd $Mdocdate: June 5 2009 $
 .Dt PCIDUMP 8
 .Os
 .Sh NAME
@@ -22,7 +22,8 @@
 .Nd show PCI device data
 .Sh SYNOPSIS
 .Nm pcidump
-.Op Fl v | x | xx
+.Op Fl v
+.Op Fl x | xx
 .Op Fl d Ar pcidev
 .Sm off
 .Op Ar bus : dev : func
diff --git a/usr.sbin/pcidump/pcidump.c b/usr.sbin/pcidump/pcidump.c
index d7efe42161c..db81d43d4be 100644
--- a/usr.sbin/pcidump/pcidump.c
+++ b/usr.sbin/pcidump/pcidump.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcidump.c,v 1.16 2008/10/07 09:23:32 dlg Exp $	*/
+/*	$OpenBSD: pcidump.c,v 1.17 2009/06/05 19:19:02 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2006, 2007 David Gwynne <loki@animata.net>
@@ -107,7 +107,7 @@ main(int argc, char *argv[])
 	argc -= optind;
 	argv += optind;
 
-	if (argc > 1 || (verbose && hex))
+	if (argc > 1)
 		usage();
 
 	if (argc == 1)
-- 
cgit v1.2.3