xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/ati_pciids_gen.h              |    1 -
 src/pcidb/ati_pciids.csv          |    1 -
 src/radeon_chipinfo_gen.h         |    1 -
 src/radeon_chipset_gen.h          |    1 -
 src/radeon_pci_chipset_gen.h      |    1 -
 src/radeon_pci_device_match_gen.h |    1 -
 6 files changed, 6 deletions(-)

New commits:
commit 9c124f781049ef11a8b19894a29b7f62975b3011
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Tue Feb 1 18:59:40 2011 -0500

    radeon: remove device 0x4243
    
    0x4243 is a PCI bridge, not a gpu.
    
    See:
    https://bugs.freedesktop.org/show_bug.cgi?id=33815
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h
index 5e5ced6..f7b7569 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -25,7 +25,6 @@
 #define PCI_CHIP_MACH32 0x4158
 #define PCI_CHIP_RS250_4237 0x4237
 #define PCI_CHIP_R200_BB 0x4242
-#define PCI_CHIP_R200_BC 0x4243
 #define PCI_CHIP_RS100_4336 0x4336
 #define PCI_CHIP_RS200_4337 0x4337
 #define PCI_CHIP_MACH64CT 0x4354
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index 1f4756a..e8bfb4c 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -26,7 +26,6 @@
 "0x4158","MACH32","MACH32",,,,,,
 "0x4237","RS250_4237","RS200",,1,,,1,"ATI Radeon 7000 IGP (A4+) 4237"
 "0x4242","R200_BB","R200",,,,1,,"ATI Radeon 8500 AIW BB (AGP)"
-"0x4243","R200_BC","R200",,,,1,,"ATI Radeon 8500 AIW BC (AGP)"
 "0x4336","RS100_4336","RS100",1,1,,,1,"ATI Radeon IGP320M (U1) 4336"
 "0x4337","RS200_4337","RS200",1,1,,,1,"ATI Radeon IGP330M/340M/350M (U2) 4337"
 "0x4354","MACH64CT","MACH64",,,,,,
diff --git a/src/radeon_chipinfo_gen.h b/src/radeon_chipinfo_gen.h
index 352fa99..a90fae7 100644
--- a/src/radeon_chipinfo_gen.h
+++ b/src/radeon_chipinfo_gen.h
@@ -26,7 +26,6 @@ static RADEONCardInfo RADEONCards[] = {
  { 0x4156, CHIP_FAMILY_RV350, 0, 0, 0, 0, 0 },
  { 0x4237, CHIP_FAMILY_RS200, 0, 1, 0, 0, 1 },
  { 0x4242, CHIP_FAMILY_R200, 0, 0, 0, 1, 0 },
- { 0x4243, CHIP_FAMILY_R200, 0, 0, 0, 1, 0 },
  { 0x4336, CHIP_FAMILY_RS100, 1, 1, 0, 0, 1 },
  { 0x4337, CHIP_FAMILY_RS200, 1, 1, 0, 0, 1 },
  { 0x4437, CHIP_FAMILY_RS200, 1, 1, 0, 0, 1 },
diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h
index 09a957e..2af046c 100644
--- a/src/radeon_chipset_gen.h
+++ b/src/radeon_chipset_gen.h
@@ -26,7 +26,6 @@ static SymTabRec RADEONChipsets[] = {
   { PCI_CHIP_RV350_AV, "ATI FireGL RV360 AV (AGP)" },
   { PCI_CHIP_RS250_4237, "ATI Radeon 7000 IGP (A4+) 4237" },
   { PCI_CHIP_R200_BB, "ATI Radeon 8500 AIW BB (AGP)" },
-  { PCI_CHIP_R200_BC, "ATI Radeon 8500 AIW BC (AGP)" },
   { PCI_CHIP_RS100_4336, "ATI Radeon IGP320M (U1) 4336" },
   { PCI_CHIP_RS200_4337, "ATI Radeon IGP330M/340M/350M (U2) 4337" },
   { PCI_CHIP_RS250_4437, "ATI Radeon Mobility 7000 IGP 4437" },
diff --git a/src/radeon_pci_chipset_gen.h b/src/radeon_pci_chipset_gen.h
index d6b3b11..b4b2a79 100644
--- a/src/radeon_pci_chipset_gen.h
+++ b/src/radeon_pci_chipset_gen.h
@@ -26,7 +26,6 @@ PciChipsets RADEONPciChipsets[] = {
  { PCI_CHIP_RV350_AV, PCI_CHIP_RV350_AV, RES_SHARED_VGA },
  { PCI_CHIP_RS250_4237, PCI_CHIP_RS250_4237, RES_SHARED_VGA },
  { PCI_CHIP_R200_BB, PCI_CHIP_R200_BB, RES_SHARED_VGA },
- { PCI_CHIP_R200_BC, PCI_CHIP_R200_BC, RES_SHARED_VGA },
  { PCI_CHIP_RS100_4336, PCI_CHIP_RS100_4336, RES_SHARED_VGA },
  { PCI_CHIP_RS200_4337, PCI_CHIP_RS200_4337, RES_SHARED_VGA },
  { PCI_CHIP_RS250_4437, PCI_CHIP_RS250_4437, RES_SHARED_VGA },
diff --git a/src/radeon_pci_device_match_gen.h b/src/radeon_pci_device_match_gen.h
index dc34586..aa50306 100644
--- a/src/radeon_pci_device_match_gen.h
+++ b/src/radeon_pci_device_match_gen.h
@@ -26,7 +26,6 @@ static const struct pci_id_match radeon_device_match[] = {
  ATI_DEVICE_MATCH( PCI_CHIP_RV350_AV, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_RS250_4237, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_R200_BB, 0 ),
- ATI_DEVICE_MATCH( PCI_CHIP_R200_BC, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_RS100_4336, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_RS200_4337, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_RS250_4437, 0 ),