diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-05-18 14:32:57 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-05-18 14:32:57 -0700 |
| commit | 12ae69d843447d3a973b0d9087f4f34f18e96ae8 (patch) | |
| tree | 4e301fda2cf201bddda9e9ed445958308e8e3e24 /core/isolinux.asm | |
| parent | b59d70ca4c0140550d9be8d029dc79e605fa3954 (diff) | |
| parent | 4826c90afd85d3bc8ee963de0bf1438340db865a (diff) | |
| download | syslinux-12ae69d843447d3a973b0d9087f4f34f18e96ae8.tar.gz | |
Merge branch 'master' into core32
Conflicts:
core/extlinux.asm
core/isolinux.asm
core/ldlinux.asm
core/pxeidle.inc
core/pxelinux.asm
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'core/isolinux.asm')
| -rw-r--r-- | core/isolinux.asm | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/core/isolinux.asm b/core/isolinux.asm index 3be435b7..4ed12a74 100644 --- a/core/isolinux.asm +++ b/core/isolinux.asm @@ -40,16 +40,6 @@ SECTOR_SIZE equ (1 << SECTOR_SHIFT) ROOT_DIR_WORD equ 0x002F ; -; This is what we need to do when idle -; -%macro RESET_IDLE 0 - ; Nothing -%endmacro -%macro DO_IDLE 0 - ; Nothing -%endmacro - -; ; The following structure is used for "virtual kernels"; i.e. LILO-style ; option labels. The options we permit here are `kernel' and `append ; Since there is no room in the bottom 64K for all of these, we |