diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:19 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:19 +0000 |
| commit | 397653e558b5fa4936ee6c9ac1eb6acaa9cf1cbc (patch) | |
| tree | 5988c3f829963dfa7315e626c4d0e72e85d76e09 /src/atichip.h | |
| parent | 42cbea1d05a9e44b0d560da29bff19711ebb8a94 (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-XFIXES
Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid
future conflicts on ASCII but not humal readable files. (There should
probably be separate CreditsXorg.rtf files) (Egbert Eich).
Diffstat (limited to 'src/atichip.h')
| -rw-r--r-- | src/atichip.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/atichip.h b/src/atichip.h index 457579b4..e47947d8 100644 --- a/src/atichip.h +++ b/src/atichip.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.h,v 1.26 2004/01/05 16:42:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.h,v 1.26tsi Exp $ */ /* * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * @@ -77,7 +77,7 @@ typedef enum ATI_CHIP_264LTPRO, /* Mach64 */ ATI_CHIP_264XL, /* Mach64 */ ATI_CHIP_MOBILITY, /* Mach64 */ - ATI_CHIP_Mach64, /* Mach64 */ + ATI_CHIP_Mach64, /* Last among Mach64's */ ATI_CHIP_RAGE128GL, /* Rage128 */ ATI_CHIP_RAGE128VR, /* Rage128 */ ATI_CHIP_RAGE128PROGL, /* Rage128 */ @@ -85,7 +85,7 @@ typedef enum ATI_CHIP_RAGE128PROULTRA, /* Rage128 */ ATI_CHIP_RAGE128MOBILITY3, /* Rage128 */ ATI_CHIP_RAGE128MOBILITY4, /* Rage128 */ - ATI_CHIP_Rage128, /* Rage128 */ + ATI_CHIP_Rage128, /* Last among Rage128's */ ATI_CHIP_RADEON, /* Radeon */ ATI_CHIP_RADEONVE, /* Radeon VE */ ATI_CHIP_RADEONMOBILITY6, /* Radeon M6 */ @@ -104,6 +104,7 @@ typedef enum ATI_CHIP_RV350, /* RV350 */ ATI_CHIP_R350, /* R350 */ ATI_CHIP_R360, /* R360 */ + ATI_CHIP_Radeon, /* Last among Radeon's */ ATI_CHIP_HDTV /* HDTV */ } ATIChipType; |