From 74fffbf1bb39430600179de1567ef9a96830a15c Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliamson@mandriva.org>
Date: Fri, 9 Mar 2007 03:49:38 +0000
Subject: Drop P9000 / P9100 definitions (four supported cards merged into
 generic VGA driver)

---
 lst/Cards+   | 31 -------------------------------
 lst/pcitable |  8 ++++----
 2 files changed, 4 insertions(+), 35 deletions(-)

(limited to 'lst')

diff --git a/lst/Cards+ b/lst/Cards+
index 88337ed3..c70668bd 100644
--- a/lst/Cards+
+++ b/lst/Cards+
@@ -294,37 +294,6 @@ DRIVER2 fglrx
 NAME Ark Logic ARKx000-based cards
 DRIVER ark
 
-# P9000
-
-NAME Diamond Viper VLB 2Mb
-DRIVER vga
-LINE     #Clocks must match the mode clocks (XFree86 3.1 P9000 server)
-LINE     #Versions later than 3.1 do not require a clocks line
-LINE     Chipset "vipervlb" # Required for some cards which autodetect as PCI
-LINE     Videoram 2048      # Required
-LINE     Membase 0x80000000 # Optional (0x80000000 is default)
-
-NAME Diamond Viper PCI 2Mb
-DRIVER vga
-LINE     #Clocks must match the mode clocks (XFree86 3.1 P9000 server)
-LINE     #Versions later than 3.1 do not require a clocks line
-LINE     Videoram 2048      # Required
-LINE     #Membase 0x80000000 # Use scanpci to get the correct Membase
-
-NAME Orchid P9000 VLB
-DRIVER vga
-LINE     Chipset "orchid_p9000"
-LINE     Membase 0xE0000000
-
-# P9100
-
-NAME Weitek P9100 (generic)
-DRIVER vga
-
-NAME Diamond Viper Pro Video
-SEE Weitek P9100 (generic)
-
-
 # National Semiconductor (NSC)
 
 NAME NSC
diff --git a/lst/pcitable b/lst/pcitable
index 75739226..0fa59459 100644
--- a/lst/pcitable
+++ b/lst/pcitable
@@ -837,10 +837,10 @@
 0x100c	0x4702	"Card:Tseng ET4000W32p / ET6x00-based cards"	"Tseng Labs Inc.|ET6300"
 0x100e	0x0564	"unknown"	"Weitek|STPC Client Host Bridge"
 0x100e	0x55cc	"unknown"	"Weitek|STPC Client South Bridge"
-0x100e	0x9000	"Card:Diamond Viper PCI 2Mb"	"Weitek|P9000 Viper"
-0x100e	0x9001	"Card:Diamond Viper PCI 2Mb"	"Weitek|P9000 Viper"
-0x100e	0x9002	"Card:Diamond Viper PCI 2Mb"	"Weitek|P9000 Viper"
-0x100e	0x9100	"Card:Diamond Viper PCI 2Mb"	"Weitek|P9100 Viper Pro/SE"
+0x100e	0x9000	"Card:VGA driver (generic)"	"Weitek|P9000 Viper"
+0x100e	0x9001	"Card:VGA driver (generic)"	"Weitek|P9000 Viper"
+0x100e	0x9002	"Card:VGA driver (generic)"	"Weitek|P9000 Viper"
+0x100e	0x9100	"Card:VGA driver (generic)"	"Weitek|P9100 Viper Pro/SE"
 0x1011	0x0001	"tulip"	"Digital Equipment Corp.|DECchip 21050"
 0x1011	0x0002	"de2104x"	"Digital Equipment Corp.|DECchip 21040 [Tulip]"
 0x1011	0x0004	"unknown"	"Digital Equipment Corp.|21030/TGA"
-- 
cgit v1.2.1