summaryrefslogtreecommitdiff
path: root/memdisk/memdisk16.asm
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-07-07 15:32:21 -0700
committerH. Peter Anvin <hpa@zytor.com>2008-07-07 15:32:21 -0700
commit852d962ee2d0a51bf7aa3c6f0b1fdecbef1a3efd (patch)
tree1fd82e3dcc96b5049ae7f47ca2ed3df0ac3d93a7 /memdisk/memdisk16.asm
parent07ff8e874b0bd1d1c4fa893c94063fbedf6e3315 (diff)
downloadsyslinux-852d962ee2d0a51bf7aa3c6f0b1fdecbef1a3efd.tar.gz
Share the gen-id stuff between core and memdisk
Both core and memdisk wants to use the gen-id stuff, so let it.
Diffstat (limited to 'memdisk/memdisk16.asm')
-rw-r--r--memdisk/memdisk16.asm4
1 files changed, 3 insertions, 1 deletions
diff --git a/memdisk/memdisk16.asm b/memdisk/memdisk16.asm
index d73ddc5d..d43404e8 100644
--- a/memdisk/memdisk16.asm
+++ b/memdisk/memdisk16.asm
@@ -19,6 +19,8 @@
;; com32.inc in the main SYSLINUX distribution.
;;
+%include '../version.gen'
+
MY_CS equ 0x0800 ; Segment address to use
CS_BASE equ (MY_CS << 4) ; Corresponding address
@@ -79,7 +81,7 @@ b_edx dd 0 ; EDX for boot sector invocation
section .rodata
memdisk_version:
- db "MEMDISK ", VERSION, " ", DATE, 0
+ db "MEMDISK ", VERSION_STR, " ", DATE, 0
;; -----------------------------------------------------------------------
;; End kernel image header