xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit ba5fcc4d6b6eae3f2c55c6229a53d24d160789c1
Author: Alex Deucher <alexander.deucher at amd.com>
Date:   Thu Aug 21 11:32:45 2014 -0400

    radeon/kms: fix mullins pci id
    
    strange errant change from:
    39fef269f521c92a2a31c80447e9401bacb3797a
    
    Signed-off-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h
index e59cd59..d867fa7 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -733,7 +733,7 @@
 #define PCI_CHIP_MULLINS_9852 0x9852
 #define PCI_CHIP_MULLINS_9853 0x9853
 #define PCI_CHIP_MULLINS_9854 0x9854
-#define PCI_CHIP_MULLINS_9855 0x9845
+#define PCI_CHIP_MULLINS_9855 0x9855
 #define PCI_CHIP_MULLINS_9856 0x9856
 #define PCI_CHIP_MULLINS_9857 0x9857
 #define PCI_CHIP_MULLINS_9858 0x9858
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index a3168a3..1c92f5b 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -734,7 +734,7 @@
 "0x9852","MULLINS_9852","MULLINS",1,1,,,1,"MULLINS"
 "0x9853","MULLINS_9853","MULLINS",1,1,,,1,"MULLINS"
 "0x9854","MULLINS_9854","MULLINS",1,1,,,1,"MULLINS"
-"0x9845","MULLINS_9855","MULLINS",1,1,,,1,"MULLINS"
+"0x9855","MULLINS_9855","MULLINS",1,1,,,1,"MULLINS"
 "0x9856","MULLINS_9856","MULLINS",1,1,,,1,"MULLINS"
 "0x9857","MULLINS_9857","MULLINS",1,1,,,1,"MULLINS"
 "0x9858","MULLINS_9858","MULLINS",1,1,,,1,"MULLINS"
diff --git a/src/radeon_chipinfo_gen.h b/src/radeon_chipinfo_gen.h
index dc9866f..40577c9 100644
--- a/src/radeon_chipinfo_gen.h
+++ b/src/radeon_chipinfo_gen.h
@@ -653,7 +653,7 @@ static RADEONCardInfo RADEONCards[] = {
  { 0x9852, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
  { 0x9853, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
  { 0x9854, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
- { 0x9845, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
+ { 0x9855, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
  { 0x9856, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
  { 0x9857, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
  { 0x9858, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },