aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-02-26 20:46:48 -0800
committerH. Peter Anvin <hpa@zytor.com>2009-02-26 20:46:48 -0800
commitcec06cac17751fed108150f416fe121f30e25faa (patch)
tree8ee4a6bb52f03d4c684ea90367dc2c5ba56397e0
parentc73ffb0c9d7b42046a895df80b2443c21d41fef7 (diff)
parent7ea0d78e6b84abbc66591125fd5754a1a205a25f (diff)
downloadsyslinux-elf-cec06cac17751fed108150f416fe121f30e25faa.tar.gz
syslinux-elf-cec06cac17751fed108150f416fe121f30e25faa.tar.xz
syslinux-elf-cec06cac17751fed108150f416fe121f30e25faa.zip
Merge branch 'master' into hdt
-rw-r--r--core/bcopy32.inc1
1 files changed, 0 insertions, 1 deletions
diff --git a/core/bcopy32.inc b/core/bcopy32.inc
index 2d6b2e92..4ebbe3ca 100644
--- a/core/bcopy32.inc
+++ b/core/bcopy32.inc
@@ -665,7 +665,6 @@ shuffle_and_boot:
xor edx,edx
mov ecx,12
div ecx ; Convert to descriptor count
- xchg ecx,eax
jmp .restart
;