diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-10-11 21:16:37 +0100 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2012-10-11 21:17:58 +0100 |
| commit | 940d4876ab8dc6dcbdbf47ba8be98cba0516c66e (patch) | |
| tree | b42256b0f3344a52622febf3306933ae1f8bd864 /com32/modules/Makefile | |
| parent | 7d9ee65cc9577eb69782a49a34895ae80820e9ff (diff) | |
| parent | 85dba2c3058996d72def4a44304df882da3aa807 (diff) | |
| download | syslinux-940d4876ab8dc6dcbdbf47ba8be98cba0516c66e.tar.gz | |
Merge branch 'pxechn-fix-news-for-hpa-2' of git://github.com/geneC/syslinux
Conflicts:
NEWS
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 24b7d283..f110e584 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 pxechn.c32 kontron_wdt.c32 ifmemdsk.c32 + whichsys.c32 prdhcp.c32 pxechn.c32 kontron_wdt.c32 ifmemdsk.c32 TESTFILES = |