diff options
author | Dave Airlie <airlied@linux.ie> | 2006-03-19 04:01:37 -0500 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2006-03-19 04:01:37 -0500 |
commit | dfab11542fbecd8539c092fe36155909b4812f73 (patch) | |
tree | c96ad45aad247e9e0c8091a1d3550ead9eebb97b /drivers/char/drm/radeon_drv.h | |
parent | ee4621f011750a6eff9f56631e12ab7fd9503aaa (diff) |
drm: rationalise some pci ids
This is the start of some work from Roland Scheidegger to align
the X DDX pci ids and the drm ones, however we don't want to put
r300 ids in the kernel just yet, they destabilise a few machines.
From: Roland Scheidegger (via DRM CVS)
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/radeon_drv.h')
-rw-r--r-- | drivers/char/drm/radeon_drv.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/char/drm/radeon_drv.h b/drivers/char/drm/radeon_drv.h index 5cf555e4637b..31bacfa2edee 100644 --- a/drivers/char/drm/radeon_drv.h +++ b/drivers/char/drm/radeon_drv.h | |||
@@ -103,20 +103,21 @@ | |||
103 | */ | 103 | */ |
104 | enum radeon_family { | 104 | enum radeon_family { |
105 | CHIP_R100, | 105 | CHIP_R100, |
106 | CHIP_RS100, | ||
107 | CHIP_RV100, | 106 | CHIP_RV100, |
107 | CHIP_RS100, | ||
108 | CHIP_RV200, | 108 | CHIP_RV200, |
109 | CHIP_R200, | ||
110 | CHIP_RS200, | 109 | CHIP_RS200, |
111 | CHIP_R250, | 110 | CHIP_R200, |
112 | CHIP_RS250, | ||
113 | CHIP_RV250, | 111 | CHIP_RV250, |
112 | CHIP_RS300, | ||
114 | CHIP_RV280, | 113 | CHIP_RV280, |
115 | CHIP_R300, | 114 | CHIP_R300, |
116 | CHIP_RS300, | ||
117 | CHIP_R350, | 115 | CHIP_R350, |
118 | CHIP_RV350, | 116 | CHIP_RV350, |
117 | CHIP_RV380, | ||
119 | CHIP_R420, | 118 | CHIP_R420, |
119 | CHIP_RV410, | ||
120 | CHIP_RS400, | ||
120 | CHIP_LAST, | 121 | CHIP_LAST, |
121 | }; | 122 | }; |
122 | 123 | ||