X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=drivers%2Fvideo%2FsmiLynxEM.c;h=2001e9caac27a453298eefe8a23678813721cc73;hb=ece444b42b71eb5bce34a24ec584573b3c8c4a98;hp=20f9beb0172ad6809d471201a7077f0165bec864;hpb=352d259130b349fe9593b8dada641bd78a9659e5;p=oweals%2Fu-boot.git

diff --git a/drivers/video/smiLynxEM.c b/drivers/video/smiLynxEM.c
index 20f9beb017..2001e9caac 100644
--- a/drivers/video/smiLynxEM.c
+++ b/drivers/video/smiLynxEM.c
@@ -12,7 +12,7 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
@@ -40,8 +40,6 @@
 
 #include <common.h>
 
-#if defined(CONFIG_VIDEO_SMI_LYNXEM)
-
 #include <pci.h>
 #include <video_fb.h>
 #include "videomodes.h"
@@ -598,7 +596,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 */
@@ -617,7 +615,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 =
@@ -671,7 +669,7 @@ void *video_hw_init (void)
 		break;
 	}
 
-	pGD->isaBase = CFG_ISA_IO;
+	pGD->isaBase = CONFIG_SYS_ISA_IO;
 	pGD->pciBase = pci_mem_base;
 	pGD->dprBase = (pci_mem_base + 0x400000 + 0x8000);
 	pGD->vprBase = (pci_mem_base + 0x400000 + 0xc000);
@@ -854,5 +852,3 @@ void video_set_lut (
 	out8 (SMI_LUT_RGB, b>>2);    /* blue */
 	udelay (10);
 }
-
-#endif /* CONFIG_VIDEO_SMI_LYNXEM */