diff options
| author | Felix Kuehling <fxkuehl@gmx.de> | 2005-02-04 01:14:49 +0000 |
|---|---|---|
| committer | Felix Kuehling <fxkuehl@gmx.de> | 2005-02-04 01:14:49 +0000 |
| commit | 9ae75471d246302a79994bdc71ae7e6a3915b609 (patch) | |
| tree | 295c2d5741d00a5d6b5325baf861912b4ac5d114 | |
| parent | 367d124c4b49ac134a9f2bf8acb6711957ef21c6 (diff) | |
Applied patch (id=1354) by Mike A. Harris from bug #1901: The attached
patch updates a couple of PCI IDs for the Savage driver --
Debian/Ubuntu/Red Hat/Fedora.
| -rw-r--r-- | src/savage_driver.c | 4 | ||||
| -rw-r--r-- | src/savage_regs.h | 24 |
2 files changed, 2 insertions, 26 deletions
diff --git a/src/savage_driver.c b/src/savage_driver.c index 7ed25e6..921cb87 100644 --- a/src/savage_driver.c +++ b/src/savage_driver.c @@ -125,8 +125,8 @@ static SymTabRec SavageChips[] = { { PCI_CHIP_SAVAGE_IX, "Savage/IX" }, { PCI_CHIP_PROSAVAGE_PM, "ProSavage PM133" }, { PCI_CHIP_PROSAVAGE_KM, "ProSavage KM133" }, - { PCI_CHIP_S3TWISTER_P, "ProSavage PN133" }, - { PCI_CHIP_S3TWISTER_K, "ProSavage KN133" }, + { PCI_CHIP_S3TWISTER_P, "Twister PN133" }, + { PCI_CHIP_S3TWISTER_K, "Twister KN133" }, { PCI_CHIP_SUPSAV_MX128, "SuperSavage/MX 128" }, { PCI_CHIP_SUPSAV_MX64, "SuperSavage/MX 64" }, { PCI_CHIP_SUPSAV_MX64C, "SuperSavage/MX 64C" }, diff --git a/src/savage_regs.h b/src/savage_regs.h index 6feff07..073ca0d 100644 --- a/src/savage_regs.h +++ b/src/savage_regs.h @@ -11,30 +11,6 @@ # define SAVAGE_CAP_ID_NULL 0x00 /* End of capability list */ # define SAVAGE_CAP_ID_AGP 0x02 /* AGP capability ID */ -/* These are here until xf86PciInfo.h is updated. */ - -#ifndef PCI_CHIP_S3TWISTER_P -#define PCI_CHIP_S3TWISTER_P 0x8d01 -#endif -#ifndef PCI_CHIP_S3TWISTER_K -#define PCI_CHIP_S3TWISTER_K 0x8d02 -#endif -#ifndef PCI_CHIP_SUPSAV_MX128 -#define PCI_CHIP_SUPSAV_MX128 0x8c22 -#define PCI_CHIP_SUPSAV_MX64 0x8c24 -#define PCI_CHIP_SUPSAV_MX64C 0x8c26 -#define PCI_CHIP_SUPSAV_IX128SDR 0x8c2a -#define PCI_CHIP_SUPSAV_IX128DDR 0x8c2b -#define PCI_CHIP_SUPSAV_IX64SDR 0x8c2c -#define PCI_CHIP_SUPSAV_IX64DDR 0x8c2d -#define PCI_CHIP_SUPSAV_IXCSDR 0x8c2e -#define PCI_CHIP_SUPSAV_IXCDDR 0x8c2f -#endif -#ifndef PCI_CHIP_PROSAVAGE_DDR -#define PCI_CHIP_PROSAVAGE_DDR 0x8d03 -#define PCI_CHIP_PROSAVAGE_DDRK 0x8d04 -#endif - #define S3_SAVAGE3D_SERIES(chip) ((chip>=S3_SAVAGE3D) && (chip<=S3_SAVAGE_MX)) #define S3_SAVAGE4_SERIES(chip) ((chip==S3_SAVAGE4) \ |