aboutsummaryrefslogtreecommitdiffstats
path: root/core/bios.c
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-09-05 17:06:40 +0100
committerMatt Fleming <matt.fleming@intel.com>2012-09-05 17:06:40 +0100
commita9792c6b93c4857bab10b6bebe206e8cf016c2ab (patch)
treeae4ea563a8205321532499df2898299243e536fb /core/bios.c
parentf44155fa7406f505642f5d1433f1e4127e025ce4 (diff)
parenta40bb65a4d1351c7c2b414152186f63aa5ea2a07 (diff)
downloadsyslinux-a9792c6b93c4857bab10b6bebe206e8cf016c2ab.tar.gz
syslinux-a9792c6b93c4857bab10b6bebe206e8cf016c2ab.tar.xz
syslinux-a9792c6b93c4857bab10b6bebe206e8cf016c2ab.zip
Merge branch 'elflink' into for-hpa/elflink/firmware
We need to pick up a couple of bug fixes, one of which causes some machines to hang because we're walking out of the bounds of an ELF symbol table. Conflicts: com32/lib/Makefile core/init.c
Diffstat (limited to 'core/bios.c')
-rw-r--r--core/bios.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/core/bios.c b/core/bios.c
index ce6a31c0..31adf2fd 100644
--- a/core/bios.c
+++ b/core/bios.c
@@ -261,7 +261,6 @@ static inline void bios_timer_init(void)
}
extern uint8_t bios_free_mem;
-extern void printf_init(void);
void bios_init(void)
{
@@ -274,7 +273,6 @@ void bios_init(void)
KbdMap[i] = i;
bios_adjust_screen();
- printf_init();
/* Init the memory subsystem */
bios_free_mem = (uint16_t *)0x413;