xserver: Branch 'master'

[Aaron Plattner]

 hw/xfree86/common/xf86AutoConfig.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 66fb253082ea42179180303393e48846208987fa
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Tue Jul 8 02:39:00 2008 -0700

    Try nvidia before nv under the assumption that people who install it usually want to *use* it, too.

diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
index 45c42e1..bb52127 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -176,7 +176,11 @@ videoPtrToDriverList(struct pci_device *dev,
 	case 0x102b:		    driverList[0] = "mga";	break;
 	case 0x10c8:		    driverList[0] = "neomagic"; break;
 	case 0x105d:		    driverList[0] = "i128";	break;
-	case 0x10de: case 0x12d2:   driverList[0] = "nv";	break;
+	case 0x12d2:		    driverList[0] = "nv";	break;
+	case 0x10de:
+	    driverList[0] = "nvidia";
+	    driverList[1] = "nv";
+	    break;
 	case 0x1163:		    driverList[0] = "rendition"; break;
 	case 0x5333:
 	    switch (dev->device_id)