diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-11-05 17:52:47 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-11-06 15:57:15 -0800 |
| commit | 8492da661cc77e26cd18e4cf307b78e50661ea29 (patch) | |
| tree | d3d19f6c48eef6e6b44982f3d8b2fa993edfe16c /com32/modules/Makefile | |
| parent | ebef1cd107b7034056309bf49f92a2b9e92b9fe0 (diff) | |
| parent | 259c0dca1bc6ead6003fc504e136be67a1311abb (diff) | |
| download | syslinux-8492da661cc77e26cd18e4cf307b78e50661ea29.tar.gz | |
Merge branch 'master' into fsc
Conflicts:
com32/modules/Makefile
core/pxelinux.asm
core/serirq.inc
Note: hardwired options will need to be re-implemented in PXELINUX.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'com32/modules/Makefile')
| -rw-r--r-- | com32/modules/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/com32/modules/Makefile b/com32/modules/Makefile index 68e50571..4e262782 100644 --- a/com32/modules/Makefile +++ b/com32/modules/Makefile @@ -18,10 +18,10 @@ topdir = ../.. include ../MCONFIG -MODULES = chain.c32 config.c32 ethersel.c32 dmitest.c32 cpuidtest.c32 disk.c32 \ - pcitest.c32 elf.c32 linux.c32 reboot.c32 pmload.c32 meminfo.c32 \ - sdi.c32 sanboot.c32 ifcpu64.c32 vesainfo.c32 kbdmap.c32 cmd.c32 \ - vpdtest.c32 host.c32 dir.c32 +MODULES = chain.c32 config.c32 ethersel.c32 dmitest.c32 cpuidtest.c32 \ + disk.c32 pcitest.c32 elf.c32 linux.c32 reboot.c32 pmload.c32 \ + meminfo.c32 sdi.c32 sanboot.c32 ifcpu64.c32 vesainfo.c32 \ + kbdmap.c32 cmd.c32 vpdtest.c32 host.c32 dir.c32 gpxecmd.c32 TESTFILES = |