aboutsummaryrefslogtreecommitdiffstats
path: root/com32/mboot
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-10-24 14:41:00 +0100
committerMatt Fleming <matt.fleming@intel.com>2012-10-24 14:41:00 +0100
commita7115d314dda45324baccee6898a561ed253c8e1 (patch)
tree02db40f456aa512205e06480611da3569692afef /com32/mboot
parentc5d8c3f1676afb21cc9f780b6161eaaab35730fc (diff)
parent7307d60063ee4303da4de45f9d984fdc8df92146 (diff)
downloadsyslinux-a7115d314dda45324baccee6898a561ed253c8e1.tar.gz
syslinux-a7115d314dda45324baccee6898a561ed253c8e1.tar.xz
syslinux-a7115d314dda45324baccee6898a561ed253c8e1.zip
Merge branch 'master' into elflink
The following conflict is a result of the fact comapi_chainboot was only stubbed out on the 'elflink' branch but was properly marked as obsolete in 'master'. Conflicts: core/comboot.inc
Diffstat (limited to 'com32/mboot')
-rw-r--r--com32/mboot/mboot.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/com32/mboot/mboot.c b/com32/mboot/mboot.c
index 35450e03..10e6701c 100644
--- a/com32/mboot/mboot.c
+++ b/com32/mboot/mboot.c
@@ -198,7 +198,7 @@ int main(int argc, char *argv[])
}
if (init_map())
- return 1; /* Failed to allocate intitial map */
+ return 1; /* Failed to allocate initial map */
/*
* Map the primary image. This should be done before mapping anything