diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-05-21 16:17:52 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-05-21 16:17:52 -0700 |
| commit | e22d7eeaf36c4150354cfe536045bb2ed5b17d83 (patch) | |
| tree | b0ab539d6e44a4eb95b6eb7de6fdb0603315d191 /core/ui.inc | |
| parent | 2380682b7fb14bfbf1e1ff90c4b204c3621dc2d2 (diff) | |
| parent | 89ec5fa741f415296c6d6c83da5bad32710aaa38 (diff) | |
| download | syslinux-e22d7eeaf36c4150354cfe536045bb2ed5b17d83.tar.gz | |
Merge branch 'master' into core32
Conflicts:
core/idle.inc
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'core/ui.inc')
| -rw-r--r-- | core/ui.inc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/ui.inc b/core/ui.inc index 4a97e7d3..3e42a97d 100644 --- a/core/ui.inc +++ b/core/ui.inc @@ -535,7 +535,6 @@ getchar_timeout: pop ax cmp ax,[BIOS_timer] ; Has the timer advanced? je .loop - call do_idle dec dword [ThisKbdTo] jz .timeout |