diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2013-03-20 17:14:21 +0000 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2013-03-22 13:57:44 +0000 |
| commit | 37d43cf9dd5dd2d2cef1e86aa651097473fd0b48 (patch) | |
| tree | 07a7df546f178c4e1576f4cbcc0bb4db3a8e18b4 /com32/modules/Makefile | |
| parent | bf20364b582c383b4927f898de213b1cc0981a80 (diff) | |
| parent | a107cb3b6fa219cf5f65bef366c9b00b108e9a3a (diff) | |
| download | syslinux-37d43cf9dd5dd2d2cef1e86aa651097473fd0b48.tar.gz | |
Merge tag 'syslinux-5.10-pre2' into for-hpa/elflink/firmware
syslinux-5.10-pre2
Conflicts:
NEWS
com32/include/netinet/in.h
com32/include/sys/cpu.h
com32/lib/Makefile
core/Makefile
core/fs/diskio.c
core/fs/pxe/pxe.h
core/init.c
core/mem/free.c
core/mem/malloc.c
mk/devel.mk
version
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 8965f5f0..6e562b8c 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 + hexdump.c32 poweroff.c32 cptime.c32 TESTFILES = |