xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/common/xf86AutoConfig.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 347db49ebe4596db16455ea8a1a608cfa826c5c7
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Feb 22 16:05:33 2008 -0500

    s/via/openchrome/ in the autoconfig logic.
    
    Xorg's via driver is effectively dead anyway.

diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
index c6e1972..da6c3f3 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -184,7 +184,7 @@ videoPtrToDriverName(struct pci_device *dev)
 	case 0x3d3d:		    return "glint";
 	case 0x1023:		    return "trident";
 	case 0x100c:		    return "tseng";
-	case 0x1106:		    return "via";
+	case 0x1106:		    return "openchrome";
 	case 0x15ad:		    return "vmware";
 	default: break;
     }