rename CFG_ macros to CONFIG_SYS

[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 a1e7baec164586fd518ade4e433916735b0c1739..9ebb0b0c965ac388a4adc0d61c06804cd5089404 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>
@@ -655,7 +653,7 @@ void *video_hw_init(void)
 
        tmp = 0;
 
-       videomode = CFG_DEFAULT_VIDEO_MODE;
+       videomode = CONFIG_SYS_DEFAULT_VIDEO_MODE;
        /* get video mode via environment */
        if ((penv = getenv ("videomode")) != NULL) {
                /* deceide if it is a string */
@@ -674,7 +672,7 @@ void *video_hw_init(void)
                                break;
                }
                if (i == VESA_MODES_COUNT) {
-                       printf ("no VESA Mode found, switching to mode 0x%x ", CFG_DEFAULT_VIDEO_MODE);
+                       printf ("no VESA Mode found, switching to mode 0x%x ", CONFIG_SYS_DEFAULT_VIDEO_MODE);
                        i = 0;
                }
                res_mode = (struct ctfb_res_modes *) &res_mode_init[vesa_modes[i].resindex];
@@ -734,7 +732,7 @@ void *video_hw_init(void)
                break;
        }
 
-       pGD->isaBase = CFG_ISA_IO_BASE_ADDRESS;
+       pGD->isaBase = CONFIG_SYS_ISA_IO_BASE_ADDRESS;
        pGD->pciBase = rinfo->fb_base_phys;
        pGD->frameAdrs = rinfo->fb_base_phys;
        pGD->memSize = 64 * 1024 * 1024;
@@ -777,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