aboutsummaryrefslogtreecommitdiffstats
path: root/com32/mboot/mboot.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2010-03-29 17:34:22 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2010-03-29 17:34:22 -0700
commitb6e84b7f93c5b4a0cffd132f3c6dbf6bf58ba2b9 (patch)
tree8d4b75e005cd72f67afe31b433c16528f8ce897f /com32/mboot/mboot.c
parent4121b9c7962e230f8819645ecb9d5f4eac684ed2 (diff)
parent68a7538d5a80ec8db48c02d4a9de7199df0af9f9 (diff)
downloadsyslinux-b6e84b7f93c5b4a0cffd132f3c6dbf6bf58ba2b9.tar.gz
syslinux-b6e84b7f93c5b4a0cffd132f3c6dbf6bf58ba2b9.tar.xz
syslinux-b6e84b7f93c5b4a0cffd132f3c6dbf6bf58ba2b9.zip
Merge branch 'master' into pathbased
Resolved Conflicts: MCONFIG.embedded com32/MCONFIG com32/include/com32.h core/com32.inc core/pxelinux.asm doc/comboot.txt Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'com32/mboot/mboot.c')
-rw-r--r--com32/mboot/mboot.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/com32/mboot/mboot.c b/com32/mboot/mboot.c
index a0b55628..16579e43 100644
--- a/com32/mboot/mboot.c
+++ b/com32/mboot/mboot.c
@@ -1,7 +1,7 @@
/* ----------------------------------------------------------------------- *
*
* Copyright 2007-2008 H. Peter Anvin - All Rights Reserved
- * Copyright 2009 Intel Corporation; author: H. Peter Anvin
+ * Copyright 2009-2010 Intel Corporation; author: H. Peter Anvin
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
@@ -222,6 +222,8 @@ int main(int argc, char *argv[])
/* Add auxilliary information */
mboot_make_memmap();
mboot_apm();
+ mboot_syslinux_info();
+
if (opt.solaris)
mboot_solaris_dhcp_hack();