summaryrefslogtreecommitdiff
path: root/arch/x86/boot/Makefile
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2008-01-30 15:32:49 +0300
committerIngo Molnar <mingo@elte.hu>2008-01-30 15:32:49 +0300
commita6b68076fd5d7de04e6847ed9d7d212e7dd6beb5 (patch)
tree8f9da2347cee05e03414889a2dc701e71b06dd77 /arch/x86/boot/Makefile
parent37f30e21d6be046e948fce1dfa4a968cf5abcf89 (diff)
downloadlinux-a6b68076fd5d7de04e6847ed9d7d212e7dd6beb5.tar.xz
x86: compile apm and voyager module only when selected in Kconfig
Previously the complete files were #ifdef'ed, but now handle that in the Makefile. May save a minor bit of compilation time. [ Stephen Rothwell <sfr@canb.auug.org.au>: build dependency fix ] Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/boot/Makefile')
-rw-r--r--arch/x86/boot/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
index dcad6507f196..349b81a39c40 100644
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
@@ -28,9 +28,11 @@ SVGA_MODE := -DSVGA_MODE=NORMAL_VGA
targets := vmlinux.bin setup.bin setup.elf zImage bzImage
subdir- := compressed
-setup-y += a20.o apm.o cmdline.o copy.o cpu.o cpucheck.o edd.o
+setup-y += a20.o cmdline.o copy.o cpu.o cpucheck.o edd.o
setup-y += header.o main.o mca.o memory.o pm.o pmjump.o
-setup-y += printf.o string.o tty.o video.o version.o voyager.o
+setup-y += printf.o string.o tty.o video.o version.o
+setup-$(CONFIG_X86_APM_BOOT) += apm.o
+setup-$(CONFIG_X86_VOYAGER) += voyager.o
# The link order of the video-*.o modules can matter. In particular,
# video-vga.o *must* be listed first, followed by video-vesa.o.