Add externs to avoid multiple definitions, and then add missing definitions.

[rrq/maintain_lilo.git] / src / second.S

diff --git a/src/second.S b/src/second.S
index bec0b7baf8031464f65e7af3da80c314443a2811..37e9f1b0938a0c7428281e702bfa6af3ed33e458 100644 (file)
--- a/src/second.S
+++ b/src/second.S
@@ -1,13 +1,13 @@
-#if 0
-/* second.S  -  LILO second stage boot loader */
-Copyright 1992-1998 Werner Almesberger.
-Copyright 1999-2006 John Coffman.
-All rights reserved.
-
-Licensed under the terms contained in the file 'COPYING' in the 
-source directory.
-
-#endif
+;  second.S  -  LILO second stage boot loader
+;
+;  Copyright 1992-1998 Werner Almesberger
+;  Copyright 1999-2006 John Coffman
+;  Copyright 2009-2011 Joachim Wiedorn
+;  All rights reserved.
+;
+;  Licensed under the terms contained in the file 'COPYING'
+;  in the source directory.
+;
 
 /*#define DEBUG*/
 #define REG_DUMP 1
@@ -2927,8 +2927,7 @@ rd_setup:
        xor     edx,edx                 ; flag nothing found
        xor     esi,esi                 ; flag size==0
        xor     ebx,ebx
-       ;jmp    e8go                    ; circumvented due to BIOS problems
-       br      no_e801                 ; skip to backup plan
+       jmp     e8go
 e8go2: or      ebx,ebx                 ; test for end
        jz      e8go5
 e8go:  push    edx                     ; save best prospect