diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 20a54c54dfa62bebc220bfccbedf04224f031ba1..7fba29fbcce923ff55e1891b0ef2d99846030002 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -25,15 +25,15 @@ include $(TOPDIR)/config.mk
 
 LIB	:= $(obj)libvideo.a
 
-COBJS-y += ati_radeon_fb.o
+COBJS-$(CONFIG_ATI_RADEON_FB) += ati_radeon_fb.o
 COBJS-$(CONFIG_ATMEL_LCD) += atmel_lcdfb.o
-COBJS-y += cfb_console.o
-COBJS-y += ct69000.o
-COBJS-y += mb862xx.o
-COBJS-y += sed13806.o
-COBJS-y += sed156x.o
-COBJS-y += sm501.o
-COBJS-y += smiLynxEM.o
+COBJS-$(CONFIG_CFB_CONSOLE) += cfb_console.o
+COBJS-$(CONFIG_VIDEO_CT69000) += ct69000.o
+COBJS-$(CONFIG_VIDEO_MB862xx) += mb862xx.o
+COBJS-$(CONFIG_VIDEO_SED13806) += sed13806.o
+COBJS-$(CONFIG_SED156X) += sed156x.o
+COBJS-$(CONFIG_VIDEO_SM501) += sm501.o
+COBJS-$(CONFIG_VIDEO_SMI_LYNXEM) += smiLynxEM.o
 COBJS-y += videomodes.o
 
 COBJS	:= $(COBJS-y)
diff --git a/drivers/video/ati_radeon_fb.c b/drivers/video/ati_radeon_fb.c
index a1e7baec164586fd518ade4e433916735b0c1739..650380b2c25a0a4cc905e6959280f5df83b91779 100644
--- 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>
@@ -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
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index d313e9098c932569ae07100f252a20e59bd87bfc..79562ec11f2260e938b77a5b191226d7ccdc3af3 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -92,8 +92,6 @@ CONFIG_VIDEO_HW_CURSOR:	     - Uses the hardware cursor capability of the
 
 #include <common.h>
 
-#ifdef CONFIG_CFB_CONSOLE
-
 #include <malloc.h>
 
 /*****************************************************************************/
@@ -1352,4 +1350,3 @@ int drv_video_init (void)
 	/* No console dev available */
 	return 0;
 }
-#endif /* CONFIG_CFB_CONSOLE */
diff --git a/drivers/video/ct69000.c b/drivers/video/ct69000.c
index 29d82e4c4351976f8b045b82674de3a4d15aa6a0..cae662eaa98bab3ec761d403afe3c4f03ab9069c 100644
--- a/drivers/video/ct69000.c
+++ b/drivers/video/ct69000.c
@@ -31,8 +31,6 @@
 #include <video_fb.h>
 #include "videomodes.h"
 
-#ifdef CONFIG_VIDEO_CT69000
-
 /* debug */
 #undef VGA_DEBUG
 #undef VGA_DUMP_REG
@@ -1280,7 +1278,4 @@ video_hw_bitblt (unsigned int bpp,	/* bytes per pixel */
 	out32r (pGD->pciBase + BR08_o, (dim_y << 16) + dim_x);	/* start the BITBlt */
 	video_wait_bitblt (pGD->pciBase + BR04_o);
 }
-
-#endif				/* CONFIG_CT69000 */
-
 #endif				/* CONFIG_VIDEO */
diff --git a/drivers/video/mb862xx.c b/drivers/video/mb862xx.c
index 733d9a2accd56436289645fa299822146c1649f5..6c14b0d688c47ed4ed14635e7c6409af8e730085 100644
--- a/drivers/video/mb862xx.c
+++ b/drivers/video/mb862xx.c
@@ -28,8 +28,6 @@
 
 #include <common.h>
 
-#if defined(CONFIG_VIDEO_MB862xx)
-
 #include <asm/io.h>
 #include <pci.h>
 #include <video_fb.h>
@@ -416,4 +414,3 @@ void video_hw_bitblt (unsigned int bpp, unsigned int src_x, unsigned int src_y,
 	DE_WR_FIFO ((height << 16) | width);
 	de_wait (); /* sync */
 }
-#endif /* CONFIG_VIDEO_MB862xx */
diff --git a/drivers/video/sed13806.c b/drivers/video/sed13806.c
index 6996ca805ebf9ad6164c2881f5952857fd85cc8c..9cd19b5c62fc3045e3ae42e94aa1d0193fdab630 100644
--- a/drivers/video/sed13806.c
+++ b/drivers/video/sed13806.c
@@ -25,8 +25,6 @@
 
 #include <common.h>
 
-#ifdef CONFIG_VIDEO_SED13806
-
 #include <video_fb.h>
 #include <sed13806.h>
 
@@ -307,4 +305,3 @@ void video_init_hw_cursor (int font_width, int font_height)
     writeByte (LCD_CURSOR_CNTL, 1);
 }
 #endif
-#endif
diff --git a/drivers/video/sed156x.c b/drivers/video/sed156x.c
index e9d5ed4ccfb8a1356a01a73c881cd1ac37287917..707250d24962e8d61522940cf1b93ae7eb219299 100644
--- a/drivers/video/sed156x.c
+++ b/drivers/video/sed156x.c
@@ -28,8 +28,6 @@
 
 #include <sed156x.h>
 
-#ifdef CONFIG_SED156X
-
 /* configure according to the selected display */
 #if defined(CONFIG_SED156X_PG12864Q)
 #define LCD_WIDTH	128
@@ -562,5 +560,3 @@ void sed156x_init(void)
 	sed156x_sync();
 	sed156x_cmd_transfer(LCD_ON);			/* Turn display ON	  */
 }
-
-#endif	/* CONFIG_SED156X */
diff --git a/drivers/video/sm501.c b/drivers/video/sm501.c
index 23db02cd10a83374b077de8eb2a9aa0b87af3df5..283d2d969c9a9149a5c4f6836005d9999ccfbf4d 100644
--- a/drivers/video/sm501.c
+++ b/drivers/video/sm501.c
@@ -31,8 +31,6 @@
 
 #include <common.h>
 
-#ifdef CONFIG_VIDEO_SM501
-
 #include <video_fb.h>
 #include <sm501.h>
 
@@ -146,5 +144,3 @@ void video_set_lut (
 	)
 {
 }
-
-#endif /* CONFIG_VIDEO_SM501 */
diff --git a/drivers/video/smiLynxEM.c b/drivers/video/smiLynxEM.c
index 20f9beb0172ad6809d471201a7077f0165bec864..390dd5697b06b1461a2333f6992432f659107dda 100644
--- a/drivers/video/smiLynxEM.c
+++ b/drivers/video/smiLynxEM.c
@@ -40,8 +40,6 @@
 
 #include <common.h>
 
-#if defined(CONFIG_VIDEO_SMI_LYNXEM)
-
 #include <pci.h>
 #include <video_fb.h>
 #include "videomodes.h"
@@ -854,5 +852,3 @@ void video_set_lut (
 	out8 (SMI_LUT_RGB, b>>2);    /* blue */
 	udelay (10);
 }
-
-#endif /* CONFIG_VIDEO_SMI_LYNXEM */