aboutsummaryrefslogtreecommitdiffstats
path: root/memdisk/memdisk.inc
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-12-28 17:52:38 -0800
committerH. Peter Anvin <hpa@zytor.com>2009-12-28 17:52:38 -0800
commit4f9ce633a638d02e9c09a707e5457be6f3deed5f (patch)
tree3ec9b34911807da32f7867bad3af64f3e7452308 /memdisk/memdisk.inc
parentc5ac7c32116fb4bd4ab05b651150ae8c8da20e05 (diff)
parent978437d3bed21595e1fea1057084487fc413bef3 (diff)
downloadsyslinux-4.00-pre9.tar.gz
syslinux-4.00-pre9.tar.xz
syslinux-4.00-pre9.zip
Merge commit 'origin/master' into fscsyslinux-4.00-pre9
Resolved Conflicts: version Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'memdisk/memdisk.inc')
-rw-r--r--memdisk/memdisk.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/memdisk/memdisk.inc b/memdisk/memdisk.inc
index a92bbda2..e1a0901b 100644
--- a/memdisk/memdisk.inc
+++ b/memdisk/memdisk.inc
@@ -938,7 +938,7 @@ writehex_common:
ret
%endif
- section .data
+ section .data align=16
alignb 2
Int13Funcs dw Reset ; 00h - RESET
dw GetStatus ; 01h - GET STATUS