diff options
| author | Tom Rini <trini@ti.com> | 2012-12-03 06:47:05 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-12-03 06:47:05 -0700 |
| commit | ce12a8c1a94a2b3d585feff387497f724b98e3ce (patch) | |
| tree | 6e5db764e27df2465f5e4d9487c7561d14050064 /arch/x86/lib/video.c | |
| parent | b04eb342af72d5dbcc29ccd7f3f9475044113361 (diff) | |
| parent | 339c5111065c2b1893af1e4d6e9431b9496879a4 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/lib/video.c')
| -rw-r--r-- | arch/x86/lib/video.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/lib/video.c b/arch/x86/lib/video.c index 3d6b24d6204..20e2416ae16 100644 --- a/arch/x86/lib/video.c +++ b/arch/x86/lib/video.c @@ -222,8 +222,10 @@ 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(); } |