diff options
Diffstat (limited to 'arch/x86/lib/video.c')
| -rw-r--r-- | arch/x86/lib/video.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/x86/lib/video.c b/arch/x86/lib/video.c index 14faf8ed0bb..55cec6dab63 100644 --- a/arch/x86/lib/video.c +++ b/arch/x86/lib/video.c @@ -222,16 +222,10 @@ int video_init(void) int drv_video_init(void) { -<<<<<<< HEAD - if (video_bios_init()) - return 1; -======= #if !defined CONFIG_NO_REALMODE_CODE - if (video_bios_init()) { + if (video_bios_init()) return 1; - } #endif ->>>>>>> Allow compiling out realmode/bios code. return video_init(); } |