diff options
| author | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-12-22 11:51:38 +0000 |
|---|---|---|
| committer | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-12-22 11:51:38 +0000 |
| commit | 8821237240c5374d83298b2da5ad88fa1e3c1ef7 (patch) | |
| tree | e1bc03fa83c61165f48ffe3f528ac5496332872a /core/ui.inc | |
| parent | 38dcca25c8855c95649e3f0b5b09fae862ed5c7a (diff) | |
| parent | 7307d60063ee4303da4de45f9d984fdc8df92146 (diff) | |
| download | syslinux-8821237240c5374d83298b2da5ad88fa1e3c1ef7.tar.gz | |
Merge remote-tracking branch 'remotes/upstream/master' into baserock/morph
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 0a4bb569..631860f8 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 |