diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-10-23 15:02:50 +0100 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2012-10-23 15:02:50 +0100 |
| commit | 46ea6398fe73c05bbb739886c3ba9ea340699814 (patch) | |
| tree | d21293fd8f5302eaeb82fb71c71a1273cc8dbc24 /com32/modules/Makefile | |
| parent | 4503e6260c032db9bb24843f51fdcd8985ef5768 (diff) | |
| parent | 7a505bfa33a2fda1d1a687ef42fe7bbf4c0f37ec (diff) | |
| download | syslinux-46ea6398fe73c05bbb739886c3ba9ea340699814.tar.gz | |
Merge branch 'elflink' of git://github.com/aericson/syslinux into elflink
Conflicts:
com32/modules/Makefile
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 dd5f2e04..fcdf0471 100644 --- a/com32/modules/Makefile +++ b/com32/modules/Makefile @@ -24,7 +24,7 @@ MODULES = config.c32 ethersel.c32 dmitest.c32 cpuidtest.c32 \ meminfo.c32 sdi.c32 sanboot.c32 ifcpu64.c32 vesainfo.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 hello.c32 pxechn.c32 + whichsys.c32 pxechn.c32 TESTFILES = |