diff options
| author | Pierre-Alexandre Meyer <pierre@mouraf.org> | 2009-08-04 20:23:16 -0700 |
|---|---|---|
| committer | Pierre-Alexandre Meyer <pierre@mouraf.org> | 2009-08-04 21:01:32 -0700 |
| commit | 0b19aba1d072ab3a2d9f528d7f0042dc8bc9e0ca (patch) | |
| tree | eb93c4db28c463d98cf520e3235e7357f870c0e8 /com32/modules/Makefile | |
| parent | a6b80d3e8a356a55b4365c5e402e502843bbff8c (diff) | |
| parent | 8e01231be41fd889bcb71604dbda511688ed0f38 (diff) | |
| download | syslinux-0b19aba1d072ab3a2d9f528d7f0042dc8bc9e0ca.tar.gz | |
Merge commit 'hpa/master' into for-erwan
Conflicts:
com32/cmenu/libmenu/com32io.h
com32/gplinclude/dmi/dmi.h
com32/gplinclude/dmi/dmi_base_board.h
com32/gplinclude/dmi/dmi_memory.h
com32/gplinclude/dmi/dmi_system.h
com32/gpllib/dmi/dmi.c
com32/gpllib/dmi/dmi_memory.c
com32/include/sys/pci.h
com32/lib/pci/scan.c
com32/modules/Makefile
Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
Diffstat (limited to 'com32/modules/Makefile')
| -rw-r--r-- | com32/modules/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/com32/modules/Makefile b/com32/modules/Makefile index 76604214..c93d3afc 100644 --- a/com32/modules/Makefile +++ b/com32/modules/Makefile @@ -18,8 +18,7 @@ topdir = ../.. include ../MCONFIG -MODULES = chain.c32 config.c32 ethersel.c32 mboot.c32 dmitest.c32 \ - cpuidtest.c32 disk.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 |