summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <idr@umwelt.(none)>2006-07-24 11:53:37 -0700
committerIan Romanick <idr@umwelt.(none)>2006-07-24 11:53:37 -0700
commiteb95128f615e2f3fab17dcafd4fc260c6d4d0644 (patch)
tree110e61eb25c125c8641071bdec7dc6efd1cc4647
parent05f8b772aec2b05d92078bb60a07bd8413386363 (diff)
Changes that were missed on the previous commit. Perhaps oddness
caused by doing git-update-index at the wrong time.
-rw-r--r--hw/xfree86/common/xf86DoScanPci.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/hw/xfree86/common/xf86DoScanPci.c b/hw/xfree86/common/xf86DoScanPci.c
index d07502a39..f8039150d 100644
--- a/hw/xfree86/common/xf86DoScanPci.c
+++ b/hw/xfree86/common/xf86DoScanPci.c
@@ -44,11 +44,13 @@
#include "xf86.h"
#include "xf86Priv.h"
#include "xf86Pci.h"
+#include "Pci.h"
+#include "xf86_OSproc.h"
-static void ScanPciDisplayPCICardInfo();
+static void ScanPciDisplayPCICardInfo(void);
void
-ScanPciDisplayPCICardInfo()
+ScanPciDisplayPCICardInfo(void)
{
struct pci_id_match match;
struct pci_device_iterator *iter;
@@ -88,13 +90,13 @@ ScanPciDisplayPCICardInfo()
& svendorname, & subsysname);
if ((dev->subvendor_id != 0) || (dev->subdevice_id != 0)) {
- xf86MsgVerb(X_NONE, 0, "%s %s (0x%04 / 0x%04) using ",
+ xf86MsgVerb(X_NONE, 0, "%s %s (0x%04x / 0x%04x) using ",
(svendorname == NULL) ? "unknown vendor" : svendorname,
(subsysname == NULL) ? "unknown card" : subsysname,
dev->subvendor_id, dev->subdevice_id);
}
- xf86MsgVerb(X_NONE, 0, "%s %s (0x%04 / 0x%04)\n",
+ xf86MsgVerb(X_NONE, 0, "%s %s (0x%04x / 0x%04x)\n",
(vendorname == NULL) ? "unknown vendor" : vendorname,
(devicename == NULL) ? "unknown chip" : devicename,
dev->vendor_id, dev->device_id);