diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2011-04-25 20:23:08 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2011-04-25 20:23:08 -0700 |
| commit | 57b7af7df6599a8cdb318d7adeda1cd6fb981626 (patch) | |
| tree | 133d3559a44655f16e91dfb0b33618f34945f78c /core/ui.inc | |
| parent | 6e57f2115b84c073ccc94de55cf0e7367335c422 (diff) | |
| parent | faf815967c276bab95989d22a62b8378d7ebf6f3 (diff) | |
| download | syslinux-57b7af7df6599a8cdb318d7adeda1cd6fb981626.tar.gz syslinux-57b7af7df6599a8cdb318d7adeda1cd6fb981626.tar.xz syslinux-57b7af7df6599a8cdb318d7adeda1cd6fb981626.zip | |
Merge remote-tracking branch 'origin/master' into lwip
Resolved Conflicts:
NEWS
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'core/ui.inc')
| -rw-r--r-- | core/ui.inc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/core/ui.inc b/core/ui.inc index 36b6c6ea..f1e046ed 100644 --- a/core/ui.inc +++ b/core/ui.inc @@ -681,11 +681,8 @@ is_bad_image: %else is_bss_sector equ is_bad_image %endif -%if IS_ISOLINUX - ; ok -%else -is_disk_image equ is_bad_image -%endif + +is_disk_image equ is_bad_image ; No longer supported section .data16 boot_prompt db 'boot: ', 0 |