diff options
| author | Gabe Black <gabeblack@chromium.org> | 2011-09-19 13:57:13 -0700 |
|---|---|---|
| committer | Gabe Black <gabeblack@chromium.org> | 2011-09-19 17:18:55 -0700 |
| commit | b2b2752f33666d6cd78f95eb657a152ad77e1a8b (patch) | |
| tree | dfc99770d835ae1a2df52948023df6b9a4ac070b /arch | |
| parent | 85bd05f824ae6ae0328eebd85cddd14842a7f2db (diff) | |
Fix a stray merge conflict in arch/x86/lib/video.c
Vadim pointed out that there are merge conflict markers in
arch/x86/lib/video.c, and since these are not part of the original commit,
they must have been introduced as part of rebasing the tree.
BUG=None
TEST=Built for stumpy, although this code is apparently not being built.
Change-Id: I198a5a124d0cde67ba7c58c02b0548b50c1eb3d7
Signed-off-by: Gabe Black <gabeblack@google.com>
Reviewed-on: http://gerrit.chromium.org/gerrit/7948
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Tested-by: Gabe Black <gabeblack@chromium.org>
Commit-Ready: Gabe Black <gabeblack@chromium.org>
Diffstat (limited to 'arch')
| -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 14faf8ed0b..55cec6dab6 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(); } |