summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Williamson <awilliamson@mandriva.org>2007-03-07 05:36:14 +0000
committerAdam Williamson <awilliamson@mandriva.org>2007-03-07 05:36:14 +0000
commit6c1e15a7e35948dfcea8742fe8f08cebc743eb3e (patch)
tree63fd12424768a4fa0d40756c58ebe49620653f2d
parentfe3c985985b43c1a84e02798765d0b94840c9236 (diff)
downloadldetect-lst-6c1e15a7e35948dfcea8742fe8f08cebc743eb3e.tar
ldetect-lst-6c1e15a7e35948dfcea8742fe8f08cebc743eb3e.tar.gz
ldetect-lst-6c1e15a7e35948dfcea8742fe8f08cebc743eb3e.tar.bz2
ldetect-lst-6c1e15a7e35948dfcea8742fe8f08cebc743eb3e.tar.xz
ldetect-lst-6c1e15a7e35948dfcea8742fe8f08cebc743eb3e.zip
S3 cleanup stage 4: unichrome (switch all to openchrome driver with 3D enabled)
-rw-r--r--lst/Cards+8
-rw-r--r--lst/pcitable14
2 files changed, 8 insertions, 14 deletions
diff --git a/lst/Cards+ b/lst/Cards+
index 8e7f65d0..5af65659 100644
--- a/lst/Cards+
+++ b/lst/Cards+
@@ -244,14 +244,8 @@ LINE #Option "xaa_benchmark"
# S3 UniChrome (via)
-NAME S3 UniChrome
-DRIVER via
-DRI_GLX
-
-NAME OpenChrome
+NAME S3 UniChrome-based cards
DRIVER openchrome
-# 3D needs a DRM driver in kernel:
-#DRI_GLX
# ET4000/ET6000
diff --git a/lst/pcitable b/lst/pcitable
index a73d7d09..0c3eb803 100644
--- a/lst/pcitable
+++ b/lst/pcitable
@@ -3819,7 +3819,7 @@
0x1106 0x287c "unknown" "VIA Technologies Inc.|VT8251 PCIE Root Port"
0x1106 0x287d "unknown" "VIA Technologies Inc.|VT8251 PCIE Root Port"
0x1106 0x287e "unknown" "VIA Technologies Inc.|VT8251 Ultra VLINK Controller"
-0x1106 0x3022 "Card:S3 UniChrome" "VIA Technologies Inc.|CLE266"
+0x1106 0x3022 "Card:S3 UniChrome-based cards" "VIA Technologies Inc.|CLE266"
0x1106 0x3038 "uhci-hcd" "VIA Technologies Inc.|VT82C586B USB"
0x1106 0x3040 "i2c-via" "VIA Technologies Inc.|VT82C586B ACPI"
0x1106 0x3043 "via-rhine" "VIA Technologies Inc.|VT86C100A [Rhine 10/100]"
@@ -3841,14 +3841,14 @@
0x1106 0x3103 "unknown" "VIA Technologies Inc.|VT8615 CPU to PCI Bridge"
0x1106 0x3104 "ehci-hcd" "VIA Technologies Inc.|VT8235 USB Enhanced Controller"
0x1106 0x3106 "via-rhine" "VIA Technologies Inc.|VT6105 [Rhine III 10/100]"
-0x1106 0x3108 "Card:OpenChrome" "VIA Technologies Inc.|S3 Unichrome Pro VGA Adapter"
+0x1106 0x3108 "Card:S3 UniChrome-based cards" "VIA Technologies Inc.|S3 Unichrome Pro VGA Adapter"
0x1106 0x3109 "via-ircc" "VIA Technologies Inc.|VT8233C PCI to ISA Bridge"
0x1106 0x3112 "via-agp" "VIA Technologies Inc.|VT8361 CPU to PCI Bridge"
0x1106 0x3113 "unknown" "VIA Technologies Inc.|PCI to PCI Bridge"
0x1106 0x3116 "via-agp" "VIA Technologies Inc.|CPU-to-PCI Bridge"
-0x1106 0x3118 "Card:OpenChrome" "VIA Technologies Inc.|S3 Unichrome Pro VGA Adapter"
+0x1106 0x3118 "Card:S3 UniChrome-based cards" "VIA Technologies Inc.|S3 Unichrome Pro VGA Adapter"
0x1106 0x3119 "via-velocity" "VIA Technologies Inc.|VT3119 Gigabit Ethernet Controller"
-0x1106 0x3122 "Card:OpenChrome" "VIA Technologies Inc.|VT8623 [Apollo CLE266] integrated CastleRock graphics"
+0x1106 0x3122 "Card:S3 UniChrome-based cards" "VIA Technologies Inc.|VT8623 [Apollo CLE266] integrated CastleRock graphics"
0x1106 0x3123 "via-agp" "VIA Technologies Inc.|VT8623 CPU to PCI Bridge"
0x1106 0x3128 "via-agp" "VIA Technologies Inc.|P4X266A CPU-to-PCI Bridge"
0x1106 0x3133 "unknown" "VIA Technologies Inc.|VT3133 CPU to PCI Bridge"
@@ -3890,7 +3890,7 @@
0x1106 0x3336 "unknown" "VIA Technologies, Inc.|K8M890CE Host Bridge"
0x1106 0x3337 "i2c-viapro" "VIA Technologies Inc.|VT8237A PCI to ISA Bridge"
0x1106 0x3340 "unknown" "VIA Technologies, Inc.|PT900 Host Bridge"
-0x1106 0x3344 "Card:OpenChrome" "VIA Technologies, Inc.|UniChrome Pro IGP"
+0x1106 0x3344 "Card:S3 UniChrome-based cards" "VIA Technologies, Inc.|UniChrome Pro IGP"
0x1106 0x3349 "ahci" "VIA Technologies Inc.|VT8251 AHCI/SATA 4-Port Controller"
0x1106 0x3351 "unknown" "VIA Technologies, Inc.|VT3351 Host Bridge"
0x1106 0x3364 "unknown" "VIA Technologies, Inc.|P4M900 Host Bridge"
@@ -3929,7 +3929,7 @@
0x1106 0x6100 "via-rhine" "VIA Technologies Inc.|VT85C100A [Rhine II]"
0x1106 0x6327 "unknown" "VIA Technologies, Inc.|P4M890 Security Device"
0x1106 0x7204 "unknown" "VIA Technologies Inc.|K8M800 Bridge"
-0x1106 0x7205 "Card:OpenChrome" "VIA Technologies Inc.|KM400 Graphics Adapter"
+0x1106 0x7205 "Card:S3 UniChrome-based cards" "VIA Technologies Inc.|KM400 Graphics Adapter"
0x1106 0x7208 "unknown" "VIA Technologies Inc.|PT890 Host Bridge"
0x1106 0x7238 "unknown" "VIA Technologies Inc.|K8T890 CPU to PCI Bridge"
0x1106 0x7258 "unknown" "VIA Technologies Inc.|PT880 CPU to PCI Bridge"
@@ -6735,7 +6735,7 @@
0x5333 0x8d03 "Card:S3 Savage-based cards" "S3 Inc.|VT8751 [ProSavageDDR P4M266]"
0x5333 0x8d04 "Card:S3 Savage-based cards" "S3 Inc.|VT8751 [ProSavageDDR P4M266] VGA Controller"
0x5333 0x9102 "Card:S3 Savage-based cards" "S3 Inc.|86C410 Savage 2000"
-0x5333 0xb031 "Card:VESA driver (generic)" "S3 Inc.|86c775/86c785 [Trio 64V2/DX or /GX]"
+0x5333 0xb031 "Card:S3 8xx / 9xx / Trio-based cards" "S3 Inc.|86c775/86c785 [Trio 64V2/DX or /GX]"
0x5333 0xca00 "sonicvibes" "S3 Inc.|SonicVibes"
0x5401 0x0101 "unknown" "Ericsson|DSSS Wireless LAN PCI Card"
0x5430 0x0100 "unknown" "Evergreen Technologies Inc.|AcceleraPCI Upgrade Card Adapter"