From fe3240ceb70e61c42a0d3224f065b67eafe60711 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Sat, 23 May 2009 21:13:11 -0700 Subject: [PATCH] core: fix mismerges with the master branch Fix a couple of minor issues caused by mismerge with the master branch. Signed-off-by: H. Peter Anvin --- core/conio.inc | 2 +- core/pm.inc | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/core/conio.inc b/core/conio.inc index b5374dd..5209af1 100644 --- a/core/conio.inc +++ b/core/conio.inc @@ -415,7 +415,7 @@ VidRows resb 1 ; Rows on screen-1 ; Serial console stuff; don't put this in .config becasue we don't want ; loading a new config file to undo this setting. section .data16 - alignb 4 + alignz 4 SerialPort dw 0 ; Serial port base (or 0 for no serial port) BaudDivisor dw 115200/9600 ; Baud rate divisor FlowControl equ $ diff --git a/core/pm.inc b/core/pm.inc index 1e6f417..873da08 100644 --- a/core/pm.inc +++ b/core/pm.inc @@ -221,16 +221,6 @@ pm_irq: ; is indicated by Donnie Barnes of RedHat, the problematic system being an ; IBM ThinkPad 760EL. ; -; We typically toggle A20 twice for every 64K transferred. -; -%define IO_DELAY_PORT 80h ; Invalid port (we hope!) - -slow_out: out dx, al ; Fall through - -%macro io_delay 0 - out IO_DELAY_PORT,al - out IO_DELAY_PORT,al -%endmacro section .data16 alignz 2 -- 2.7.4