diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-11-05 13:13:25 +0000 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2012-11-05 13:21:04 +0000 |
| commit | 0b26e59c8f5dc7a8a124a033a78e08c7a2028bcd (patch) | |
| tree | 9a892c852fabd0a75d10c856105b4488cc87f66c /com32/elflink | |
| parent | cdeba8ac82f529a3a4a544c4e8346887ef81cb74 (diff) | |
| parent | b210bd5bfd0d7182b0a65f507c7557eeb90d5b16 (diff) | |
| download | syslinux-0b26e59c8f5dc7a8a124a033a78e08c7a2028bcd.tar.gz | |
Merge tag 'syslinux-5.00-pre9' into for-hpa/elflink/firmware
This merge also includes the Syslinux-4.06 release.
Conflicts:
Makefile
com32/hdt/Makefile
com32/modules/Makefile
com32/samples/hello.c
mtools/Makefile
Diffstat (limited to 'com32/elflink')
| -rw-r--r-- | com32/elflink/ldlinux/ldlinux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/com32/elflink/ldlinux/ldlinux.c b/com32/elflink/ldlinux/ldlinux.c index f82b1662..d9635956 100644 --- a/com32/elflink/ldlinux/ldlinux.c +++ b/com32/elflink/ldlinux/ldlinux.c @@ -271,7 +271,7 @@ int main(int argc __unused, char **argv __unused) size_t count = 0; char *config_argv[2] = { NULL, NULL }; - openconsole(&dev_rawcon_r, &dev_ansiserial_w); + openconsole(&dev_stdcon_r, &dev_ansiserial_w); if (ConfigName[0]) config_argv[0] = ConfigName; |