diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-05-11 16:10:06 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-05-11 16:10:06 -0700 |
| commit | 8a454337874a66ed88388f79a8181645bd7e2d00 (patch) | |
| tree | d4a78ac32b57c78ada944595cfb67fc583f6d1fd /com32/modules/Makefile | |
| parent | e23bb2825925b11c8d0f60ee007d50ca0f38a753 (diff) | |
| parent | 3cb520bd67c3a270a8dfe38654674943d01ff541 (diff) | |
| download | syslinux-8a454337874a66ed88388f79a8181645bd7e2d00.tar.gz | |
Merge branch 'master' into pathbased
Resolved Conflicts:
com32/modules/Makefile
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
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 40df0c86..69bd01bd 100644 --- a/com32/modules/Makefile +++ b/com32/modules/Makefile @@ -22,7 +22,7 @@ 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 \ - ifcpu.c32 cpuid.c32 + ifcpu.c32 cpuid.c32 cat.c32 TESTFILES = |