diff options
| author | Kim Phillips <kim.phillips@freescale.com> | 2013-02-15 17:46:50 -0600 |
|---|---|---|
| committer | Kim Phillips <kim.phillips@freescale.com> | 2013-02-15 17:46:50 -0600 |
| commit | 9a82b10c6657c5744802971036bb564ebc660291 (patch) | |
| tree | b276e71216b06494aa78d45d740b66e31c566233 /arch/x86/lib/video.c | |
| parent | 9a32084ea0cf55d22384f083002ee9932e074f31 (diff) | |
| parent | 9f024f62e4604274a23213dcee30016092e32e7b (diff) | |
| download | u-boot-imx-9a82b10c6657c5744802971036bb564ebc660291.zip u-boot-imx-9a82b10c6657c5744802971036bb564ebc660291.tar.gz u-boot-imx-9a82b10c6657c5744802971036bb564ebc660291.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'arch/x86/lib/video.c')
| -rw-r--r-- | arch/x86/lib/video.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/lib/video.c b/arch/x86/lib/video.c index 20e2416..81824f3 100644 --- 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,10 +221,5 @@ int video_init(void) int drv_video_init(void) { -#ifndef CONFIG_X86_NO_REAL_MODE - if (video_bios_init()) - return 1; -#endif - return video_init(); } |