diff options
author | Matt Fleming <matt.fleming@intel.com> | 2013-07-08 16:23:45 +0100 |
---|---|---|
committer | Matt Fleming <matt.fleming@intel.com> | 2013-07-08 16:23:45 +0100 |
commit | 3aa295d25bda39afee12b015523f222ce7940079 (patch) | |
tree | 8219b4d91f53e09d1f375547595d611065e45976 /com32/modules/Makefile | |
parent | 8eefc0dad8fe2c01b0d90d36f1cea8de8ac4d514 (diff) | |
parent | 89794a3d0b8659e2a143faeffc77877b45754c52 (diff) | |
download | syslinux-3aa295d25bda39afee12b015523f222ce7940079.tar.gz |
Merge tag 'syslinux-5.11-pre8' into firmwaresyslinux-6.02-pre1
syslinux-5.11-pre8
Conflicts:
NEWS
com32/lib/Makefile
core/conio.c
mk/devel.mk
mk/elf.mk
Diffstat (limited to 'com32/modules/Makefile')
-rw-r--r-- | com32/modules/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/com32/modules/Makefile b/com32/modules/Makefile index 6e562b8c..13cc63bb 100644 --- a/com32/modules/Makefile +++ b/com32/modules/Makefile @@ -24,7 +24,7 @@ MODULES = config.c32 ethersel.c32 dmitest.c32 cpuidtest.c32 \ kbdmap.c32 cmd.c32 vpdtest.c32 host.c32 ls.c32 gpxecmd.c32 \ ifcpu.c32 cpuid.c32 cat.c32 pwd.c32 ifplop.c32 zzjson.c32 \ whichsys.c32 prdhcp.c32 pxechn.c32 kontron_wdt.c32 ifmemdsk.c32 \ - hexdump.c32 poweroff.c32 cptime.c32 + hexdump.c32 poweroff.c32 cptime.c32 debug.c32 TESTFILES = |