diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2010-03-30 16:17:59 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-03-30 16:17:59 -0700 |
| commit | 52c9d5ba2af4e1f77aa2486a2af2bcab0b0af52c (patch) | |
| tree | 0ef759bffc55ed0f7811805440f58412e6ba3d8f /com32/modules/Makefile | |
| parent | d6fb0861c55f062797c8706f484bd47ae0f94568 (diff) | |
| parent | dcecb9f395f3ca0da3df774cb6102d885894bf84 (diff) | |
| download | syslinux-52c9d5ba2af4e1f77aa2486a2af2bcab0b0af52c.tar.gz | |
Merge branch 'master' into pathbased
Resolved Conflicts:
com32/modules/Makefile
core/comboot.inc
core/cpuinit.inc
core/idle.inc
Signed-off-by: H. Peter Anvin <hpa@linux.intel.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 b7d6212e..40df0c86 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 + ifcpu.c32 cpuid.c32 TESTFILES = |