summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTormod Volden <bugzi06.fdo.tormod@xoxy.net>2007-10-05 20:10:55 -0400
committerAlex Deucher <alex@botch2.(none)>2007-10-05 20:10:55 -0400
commitfe66cc4e02a52e1d014ae5de192c65e8abd7f58a (patch)
treef816829fe0a21eab5eae96c90024e1cc703dad13 /src
parent314e8fdbe5369e4c1786d176d03d0d2a046f25d5 (diff)
RADEON: rename to PCI_CHIP_RS485_5975 everywhere
RS482_5975 is actually RS485. see bug 12048
Diffstat (limited to 'src')
-rw-r--r--src/atipciids.h2
-rw-r--r--src/radeon_chipset.h2
-rw-r--r--src/radeon_driver.c8
-rw-r--r--src/radeon_probe.c2
4 files changed, 7 insertions, 7 deletions
diff --git a/src/atipciids.h b/src/atipciids.h
index 1c0f59a5..2aa8a3eb 100644
--- a/src/atipciids.h
+++ b/src/atipciids.h
@@ -252,7 +252,7 @@
#define PCI_CHIP_RV280_5965 0x5965
#define PCI_CHIP_RN50_5969 0x5969
#define PCI_CHIP_RS482_5974 0x5974
-#define PCI_CHIP_RS482_5975 0x5975
+#define PCI_CHIP_RS485_5975 0x5975
#define PCI_CHIP_RS400_5A41 0x5A41
#define PCI_CHIP_RS400_5A42 0x5A42
#define PCI_CHIP_RC410_5A61 0x5A61
diff --git a/src/radeon_chipset.h b/src/radeon_chipset.h
index 5cca4c81..890babdb 100644
--- a/src/radeon_chipset.h
+++ b/src/radeon_chipset.h
@@ -89,7 +89,7 @@ static SymTabRec RADEONChipsets[] = {
{ PCI_CHIP_RS480_5954, "ATI Radeon XPRESS 200 5954 (PCIE)" },
{ PCI_CHIP_RS480_5955, "ATI Radeon XPRESS 200M 5955 (PCIE)" },
{ PCI_CHIP_RS482_5974, "ATI Radeon XPRESS 200 5974 (PCIE)" },
- { PCI_CHIP_RS482_5975, "ATI Radeon XPRESS 200M 5975 (PCIE)" },
+ { PCI_CHIP_RS485_5975, "ATI Radeon XPRESS 200M 5975 (PCIE)" },
{ PCI_CHIP_RV410_5E48, "ATI FireGL V5000 (RV410) (PCIE)" },
{ PCI_CHIP_RV410_564A, "ATI Mobility FireGL V5000 (M26) (PCIE)" },
{ PCI_CHIP_RV410_564B, "ATI Mobility FireGL V5000 (M26) (PCIE)" },
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index e247f1d9..03f531e9 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -1673,7 +1673,7 @@ static Bool RADEONPreInitChipType(ScrnInfoPtr pScrn)
case PCI_CHIP_RS400_5A42:
case PCI_CHIP_RC410_5A62:
case PCI_CHIP_RS480_5955:
- case PCI_CHIP_RS482_5975:
+ case PCI_CHIP_RS485_5975:
info->IsMobility = TRUE;
case PCI_CHIP_RS400_5A41:
case PCI_CHIP_RC410_5A61:
@@ -2086,10 +2086,10 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr pScrn)
info->Chipset == PCI_CHIP_RN50_5969 ||
info->Chipset == PCI_CHIP_RC410_5A61 ||
info->Chipset == PCI_CHIP_RC410_5A62 ||
- info->Chipset == PCI_CHIP_RS482_5975) {
+ info->Chipset == PCI_CHIP_RS485_5975) {
if (xf86ReturnOptValBool(info->Options, OPTION_DRI, FALSE)) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- "Direct rendering for RN50/RC410/RS482 forced on -- "
+ "Direct rendering for RN50/RC410/RS485 forced on -- "
"This is NOT officially supported at the hardware level "
"and may cause instability or lockups\n");
} else {
@@ -2132,7 +2132,7 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr pScrn)
info->Chipset == PCI_CHIP_RS480_5954 ||
info->Chipset == PCI_CHIP_RS480_5955 ||
info->Chipset == PCI_CHIP_RS482_5974 ||
- info->Chipset == PCI_CHIP_RS482_5975) {
+ info->Chipset == PCI_CHIP_RS485_5975) {
if (info->pKernelDRMVersion->version_minor < 27) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
diff --git a/src/radeon_probe.c b/src/radeon_probe.c
index 5c7d16ff..d68a956d 100644
--- a/src/radeon_probe.c
+++ b/src/radeon_probe.c
@@ -144,7 +144,7 @@ PciChipsets RADEONPciChipsets[] = {
{ PCI_CHIP_RS480_5954, PCI_CHIP_RS480_5954, RES_SHARED_VGA },
{ PCI_CHIP_RS480_5955, PCI_CHIP_RS480_5955, RES_SHARED_VGA },
{ PCI_CHIP_RS482_5974, PCI_CHIP_RS482_5974, RES_SHARED_VGA },
- { PCI_CHIP_RS482_5975, PCI_CHIP_RS482_5975, RES_SHARED_VGA },
+ { PCI_CHIP_RS485_5975, PCI_CHIP_RS485_5975, RES_SHARED_VGA },
{ PCI_CHIP_RV410_5E48, PCI_CHIP_RV410_5E48, RES_SHARED_VGA },
{ PCI_CHIP_RV410_564A, PCI_CHIP_RV410_564A, RES_SHARED_VGA },
{ PCI_CHIP_RV410_564B, PCI_CHIP_RV410_564B, RES_SHARED_VGA },