Merge branch 'u-boot/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / arch / x86 / lib / video.c

diff --git a/arch/x86/lib/video.c b/arch/x86/lib/video.c
index 3d6b24d6204a67228f93850437013e6df2489c21..81824f314457f859a6f1aebfed6ef6ab61941edc 100644 (file)
--- a/arch/x86/lib/video.c
+++ b/arch/x86/lib/video.c
@@ -26,7 +26,6 @@
 #include <stdio_dev.h>
 #include <i8042.h>
 #include <asm/ptrace.h>
-#include <asm/realmode.h>
 #include <asm/io.h>
 #include <asm/pci.h>
 
@@ -222,8 +221,5 @@ int video_init(void)
 
 int drv_video_init(void)
 {
-       if (video_bios_init())
-               return 1;
-
        return video_init();
 }