Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

[oweals/u-boot.git] / drivers / video / ati_radeon_fb.c

diff --git a/drivers/video/ati_radeon_fb.c b/drivers/video/ati_radeon_fb.c
index 351bed0b172ea00fda6df2eee6efad4808d8bc1d..650380b2c25a0a4cc905e6959280f5df83b91779 100644 (file)
--- a/drivers/video/ati_radeon_fb.c
+++ b/drivers/video/ati_radeon_fb.c
@@ -35,8 +35,6 @@
 
 #include <common.h>
 
-#ifdef CONFIG_ATI_RADEON_FB
-
 #include <command.h>
 #include <pci.h>
 #include <asm/processor.h>
@@ -86,6 +84,7 @@
 #define PCI_CHIP_RV280_5961            0x5961
 #define PCI_CHIP_RV280_5962            0x5962
 #define PCI_CHIP_RV280_5964            0x5964
+#define PCI_CHIP_RV280_5C63            0x5C63
 #define PCI_CHIP_RV370_5B60            0x5B60
 #define PCI_CHIP_RV380_5657            0x5657
 #define PCI_CHIP_R420_554d             0x554d
@@ -95,6 +94,7 @@ static struct pci_device_id ati_radeon_pci_ids[] = {
        {PCI_VENDOR_ID_ATI, PCI_CHIP_RV280_5961},
        {PCI_VENDOR_ID_ATI, PCI_CHIP_RV280_5962},
        {PCI_VENDOR_ID_ATI, PCI_CHIP_RV280_5964},
+       {PCI_VENDOR_ID_ATI, PCI_CHIP_RV280_5C63},
        {PCI_VENDOR_ID_ATI, PCI_CHIP_RV370_5B60},
        {PCI_VENDOR_ID_ATI, PCI_CHIP_RV380_5657},
        {PCI_VENDOR_ID_ATI, PCI_CHIP_R420_554d},
@@ -106,6 +106,7 @@ static u16 ati_radeon_id_family_table[][2] = {
        {PCI_CHIP_RV280_5961, CHIP_FAMILY_RV280},
        {PCI_CHIP_RV280_5962, CHIP_FAMILY_RV280},
        {PCI_CHIP_RV280_5964, CHIP_FAMILY_RV280},
+       {PCI_CHIP_RV280_5C63, CHIP_FAMILY_RV280},
        {PCI_CHIP_RV370_5B60, CHIP_FAMILY_RV380},
        {PCI_CHIP_RV380_5657, CHIP_FAMILY_RV380},
        {PCI_CHIP_R420_554d,  CHIP_FAMILY_R420},
@@ -774,4 +775,3 @@ void video_set_lut (unsigned int index,     /* color number */
        OUTREG(PALETTE_INDEX, index);
        OUTREG(PALETTE_DATA, (r << 16) | (g << 8) | b);
 }
-#endif