xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/pcidb/ati_pciids.csv |    2 +-
 src/radeon_chipset_gen.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 63d7dece3f4be8b14012b3a2bedd850831c0437b
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Thu Jan 13 11:24:26 2011 -0500

    rs880 fix typo in HD 4250 string
    
    Noticed by Nigel Taylor
    
    Fixes:
    https://bugs.freedesktop.org/show_bug.cgi?id=33057

diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index 61b04b9..1f4756a 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -458,7 +458,7 @@
 "0x9712","RS880_9712","RS880",1,1,,,1,"ATI Mobility Radeon HD 4200"
 "0x9713","RS880_9713","RS880",1,1,,,1,"ATI Mobility Radeon 4100"
 "0x9714","RS880_9714","RS880",,1,,,1,"ATI Radeon HD 4290"
-"0x9715","RS880_9715","RS880",,1,,,1,"ATI Radeon HD 4290"
+"0x9715","RS880_9715","RS880",,1,,,1,"ATI Radeon HD 4250"
 "0x9802","PALM_9802","PALM",,1,,,1,"AMD Radeon HD 6310 Graphics"
 "0x9803","PALM_9803","PALM",,1,,,1,"AMD Radeon HD 6310 Graphics"
 "0x9804","PALM_9804","PALM",,1,,,1,"AMD Radeon HD 6250 Graphics"
diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h
index 66655e2..09a957e 100644
--- a/src/radeon_chipset_gen.h
+++ b/src/radeon_chipset_gen.h
@@ -377,7 +377,7 @@ static SymTabRec RADEONChipsets[] = {
   { PCI_CHIP_RS880_9712, "ATI Mobility Radeon HD 4200" },
   { PCI_CHIP_RS880_9713, "ATI Mobility Radeon 4100" },
   { PCI_CHIP_RS880_9714, "ATI Radeon HD 4290" },
-  { PCI_CHIP_RS880_9715, "ATI Radeon HD 4290" },
+  { PCI_CHIP_RS880_9715, "ATI Radeon HD 4250" },
   { PCI_CHIP_PALM_9802, "AMD Radeon HD 6310 Graphics" },
   { PCI_CHIP_PALM_9803, "AMD Radeon HD 6310 Graphics" },
   { PCI_CHIP_PALM_9804, "AMD Radeon HD 6250 Graphics" },