From: Alex Deucher <alexdeucher@gmail.com>
Date: Tue, 7 Jun 2011 20:59:04 +0000 (-0400)
Subject: r600g: remove pre-r6xx asic families and pci ids
X-Git-Tag: android-x86-4.4-r1~11000
X-Git-Url: http://git.sourceforge.jp/view?a=commitdiff_plain;h=5d4c4798223c3463dbf67c47b9563f82c9057e7f;p=android-x86%2Fexternal-mesa.git

r600g: remove pre-r6xx asic families and pci ids

Not sure why these were included originally.

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
---

diff --git a/src/gallium/drivers/r600/r600.h b/src/gallium/drivers/r600/r600.h
index 3d6f9c23ece..84232b10037 100644
--- a/src/gallium/drivers/r600/r600.h
+++ b/src/gallium/drivers/r600/r600.h
@@ -47,38 +47,6 @@ struct winsys_handle;
 
 enum radeon_family {
 	CHIP_UNKNOWN,
-	CHIP_R100,
-	CHIP_RV100,
-	CHIP_RS100,
-	CHIP_RV200,
-	CHIP_RS200,
-	CHIP_R200,
-	CHIP_RV250,
-	CHIP_RS300,
-	CHIP_RV280,
-	CHIP_R300,
-	CHIP_R350,
-	CHIP_RV350,
-	CHIP_RV370,
-	CHIP_RV380,
-	CHIP_R420,
-	CHIP_R423,
-	CHIP_R430,
-	CHIP_R480,
-	CHIP_R481,
-	CHIP_RV410,
-	CHIP_RS400,
-	CHIP_RC410,
-	CHIP_RS480,
-	CHIP_RS600,
-	CHIP_RS690,
-	CHIP_RS740,
-	CHIP_RV515,
-	CHIP_R520,
-	CHIP_RV530,
-	CHIP_RV560,
-	CHIP_RV570,
-	CHIP_R580,
 	CHIP_R600,
 	CHIP_RV610,
 	CHIP_RV630,
diff --git a/src/gallium/winsys/r600/drm/radeon_pciid.c b/src/gallium/winsys/r600/drm/radeon_pciid.c
index ff6821fcb52..f54a7c8fe72 100644
--- a/src/gallium/winsys/r600/drm/radeon_pciid.c
+++ b/src/gallium/winsys/r600/drm/radeon_pciid.c
@@ -34,9 +34,6 @@ struct pci_id {
 
 static const struct pci_id radeon_pci_id[] = {
 #define CHIPSET(chip, name, family) { 0x1002, chip, CHIP_##family },
-#include "pci_ids/radeon_pci_ids.h"
-#include "pci_ids/r200_pci_ids.h"
-#include "pci_ids/r300_pci_ids.h"
 #include "pci_ids/r600_pci_ids.h"
 	{0, 0},
 };