[Dri-devel] mesa-4-1-branch: Which is the right "xf86PciData.c" version?

[Dieter <Die...@ha...>]

M xc/programs/Xserver/hw/xfree86/scanpci/xf86PciData.c

But latest version. The "current" is much older.

/* $XFree86: xc/programs/Xserver/hw/xfree86/scanpci/xf86ScanPci.c,v 1.12=20
2002/07/15 20:46:0
4 dawes Exp $ */
/*
 * Display the Subsystem Vendor Id and Subsystem Id in order to identify
 * the cards installed in this computer
 *
 * Copyright 1995-2002 by The XFree86 Project, Inc.
 *
 * A lot of this comes from Robin Cutshaw's scanpci
 *
 */

Merge problem?

=2DDieter