diff options
| author | aherrman@arcor.de <aherrman@arcor.de> | 2007-09-11 14:37:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-13 11:00:42 -0400 |
| commit | 106c4a9cef3671b0a251e64c8f6fb7f1a4d801c6 (patch) | |
| tree | 2c75056c8c4b6e1857c9221c0d9949323197f3cc /drivers/video/aty/ati_ids.h | |
| parent | f2740e45ae59d76ce4303d83824d3625b23334e5 (diff) | |
radeonfb: fix chip definition for Radeon Xpress 200M 0x5975
This fixes a problem introduced with commit
b5f2f4d1a6d7efde39cfb5e1d034981c69f2214c
The commit added a wrong chip definition to radeonfb which causes
a blank console on my Laptop if radeonfb is loaded.
The patch
- renames PCI_CHIP_RS485_5975 to PCI_CHIP_RS482_5975
- corrects the chip family (RS480 instead of R300) for 0x5975
- ensures that PCI IDs are in ascending order in ati_ids.h
Signed-off-by: Andreas Herrmann <aherrman@arcor.de>
Tentatively-acked-by: Ben Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/aty/ati_ids.h')
| -rw-r--r-- | drivers/video/aty/ati_ids.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/video/aty/ati_ids.h b/drivers/video/aty/ati_ids.h index 685a754991c6..dca2eb8f2dde 100644 --- a/drivers/video/aty/ati_ids.h +++ b/drivers/video/aty/ati_ids.h | |||
| @@ -192,6 +192,12 @@ | |||
| 192 | #define PCI_CHIP_RS300_5835 0x5835 | 192 | #define PCI_CHIP_RS300_5835 0x5835 |
| 193 | #define PCI_CHIP_RS300_5836 0x5836 | 193 | #define PCI_CHIP_RS300_5836 0x5836 |
| 194 | #define PCI_CHIP_RS300_5837 0x5837 | 194 | #define PCI_CHIP_RS300_5837 0x5837 |
| 195 | #define PCI_CHIP_RS480_5955 0x5955 | ||
| 196 | #define PCI_CHIP_RV280_5960 0x5960 | ||
| 197 | #define PCI_CHIP_RV280_5961 0x5961 | ||
| 198 | #define PCI_CHIP_RV280_5962 0x5962 | ||
| 199 | #define PCI_CHIP_RV280_5964 0x5964 | ||
| 200 | #define PCI_CHIP_RS482_5975 0x5975 | ||
| 195 | #define PCI_CHIP_RV370_5B60 0x5B60 | 201 | #define PCI_CHIP_RV370_5B60 0x5B60 |
| 196 | #define PCI_CHIP_RV370_5B61 0x5B61 | 202 | #define PCI_CHIP_RV370_5B61 0x5B61 |
| 197 | #define PCI_CHIP_RV370_5B62 0x5B62 | 203 | #define PCI_CHIP_RV370_5B62 0x5B62 |
| @@ -200,14 +206,8 @@ | |||
| 200 | #define PCI_CHIP_RV370_5B65 0x5B65 | 206 | #define PCI_CHIP_RV370_5B65 0x5B65 |
| 201 | #define PCI_CHIP_RV370_5B66 0x5B66 | 207 | #define PCI_CHIP_RV370_5B66 0x5B66 |
| 202 | #define PCI_CHIP_RV370_5B67 0x5B67 | 208 | #define PCI_CHIP_RV370_5B67 0x5B67 |
| 203 | #define PCI_CHIP_RV280_5960 0x5960 | ||
| 204 | #define PCI_CHIP_RV280_5961 0x5961 | ||
| 205 | #define PCI_CHIP_RV280_5962 0x5962 | ||
| 206 | #define PCI_CHIP_RV280_5964 0x5964 | ||
| 207 | #define PCI_CHIP_RS485_5975 0x5975 | ||
| 208 | #define PCI_CHIP_RV280_5C61 0x5C61 | 209 | #define PCI_CHIP_RV280_5C61 0x5C61 |
| 209 | #define PCI_CHIP_RV280_5C63 0x5C63 | 210 | #define PCI_CHIP_RV280_5C63 0x5C63 |
| 210 | #define PCI_CHIP_R423_5D57 0x5D57 | 211 | #define PCI_CHIP_R423_5D57 0x5D57 |
| 211 | #define PCI_CHIP_RS350_7834 0x7834 | 212 | #define PCI_CHIP_RS350_7834 0x7834 |
| 212 | #define PCI_CHIP_RS350_7835 0x7835 | 213 | #define PCI_CHIP_RS350_7835 0x7835 |
| 213 | #define PCI_CHIP_RS480_5955 0x5955 | ||