diff options
| author | marha <marha@users.sourceforge.net> | 2010-07-02 14:40:53 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-07-02 14:40:53 +0000 |
| commit | bb10a5eb99178daa575d5365c8588d891e9988be (patch) | |
| tree | 8116bb4cbcf79d17b3ae6f4946cd547d14b979ed /xorg-server/hw/xfree86/common/xf86pciBus.c | |
| parent | 1faa0f175bda9074b5f45e5e005d9a80721e3c24 (diff) | |
| parent | 63a788caa35b080bde1307fc6d5715dec091fe38 (diff) | |
| download | vcxsrv-bb10a5eb99178daa575d5365c8588d891e9988be.tar.gz vcxsrv-bb10a5eb99178daa575d5365c8588d891e9988be.tar.bz2 vcxsrv-bb10a5eb99178daa575d5365c8588d891e9988be.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86pciBus.c')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86pciBus.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86pciBus.c b/xorg-server/hw/xfree86/common/xf86pciBus.c index 461c7c235..8729089cf 100644 --- a/xorg-server/hw/xfree86/common/xf86pciBus.c +++ b/xorg-server/hw/xfree86/common/xf86pciBus.c @@ -151,18 +151,13 @@ xf86PciProbe(void) /* Print a summary of the video devices found */
for (k = 0; k < num; k++) {
- const char *vendorname = NULL, *chipname = NULL;
const char *prim = " ";
Bool memdone = FALSE, iodone = FALSE;
info = xf86PciVideoInfo[k];
- vendorname = pci_device_get_vendor_name( info );
- chipname = pci_device_get_device_name( info );
-
- if ((!vendorname || !chipname) &&
- !PCIALWAYSPRINTCLASSES(info->device_class))
+ if (!PCIALWAYSPRINTCLASSES(info->device_class))
continue;
if (xf86IsPrimaryPci(info))
@@ -173,12 +168,6 @@ xf86PciProbe(void) info->vendor_id, info->device_id,
info->subvendor_id, info->subdevice_id);
- if (vendorname)
- xf86ErrorF("%s ", vendorname);
-
- if (chipname)
- xf86ErrorF("%s ", chipname);
-
xf86ErrorF("rev %d", info->revision);
for (i = 0; i < 6; i++) {
|