summaryrefslogtreecommitdiff
path: root/hw/xfree86/common/xf86AutoConfig.c
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2008-07-21 03:50:15 +0300
committerDaniel Stone <daniel@fooishbar.org>2008-07-21 03:50:15 +0300
commit0dbfe0ebc69c307c0626ba824de15d03de1251d4 (patch)
treeb317aeb70c90e2e8dd8a35312be13f9cc1c57e85 /hw/xfree86/common/xf86AutoConfig.c
parent6b5206e7cb8e5279816b48f014d47d3f03f16972 (diff)
Revert "Try nvidia before nv under the assumption that people who install it usually want to *use* it, too."
Per mailing list discussion. This reverts commit 66fb253082ea42179180303393e48846208987fa.
Diffstat (limited to 'hw/xfree86/common/xf86AutoConfig.c')
-rw-r--r--hw/xfree86/common/xf86AutoConfig.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
index bb521276c..45c42e1d8 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -176,11 +176,7 @@ videoPtrToDriverList(struct pci_device *dev,
case 0x102b: driverList[0] = "mga"; break;
case 0x10c8: driverList[0] = "neomagic"; break;
case 0x105d: driverList[0] = "i128"; break;
- case 0x12d2: driverList[0] = "nv"; break;
- case 0x10de:
- driverList[0] = "nvidia";
- driverList[1] = "nv";
- break;
+ case 0x10de: case 0x12d2: driverList[0] = "nv"; break;
case 0x1163: driverList[0] = "rendition"; break;
case 0x5333:
switch (dev->device_id)