diff options
| author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-06-16 19:58:28 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 10:38:25 +0200 |
| commit | 064d25f12014ae1d97c2882f9ab874995321f2b2 (patch) | |
| tree | a6f39b226bbae5a2abc15d911cdf12d01b9c8c19 /arch/x86/kernel/Makefile | |
| parent | cc9f7a0ccf000d4db5fbdc7b0ae48eefea102f69 (diff) | |
| download | linux-064d25f12014ae1d97c2882f9ab874995321f2b2.tar.gz linux-064d25f12014ae1d97c2882f9ab874995321f2b2.tar.bz2 linux-064d25f12014ae1d97c2882f9ab874995321f2b2.zip | |
x86: merge setup_memory_map with e820
... and kill e820_32/64.c and e820_32/64.h
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/Makefile')
| -rw-r--r-- | arch/x86/kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index dc3c636d113e..bcc2b123dabf 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -22,7 +22,7 @@ obj-y += setup_$(BITS).o i8259_$(BITS).o setup.o obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o obj-$(CONFIG_X86_64) += syscall_64.o vsyscall_64.o setup64.o -obj-y += bootflag.o e820_$(BITS).o e820.o +obj-y += bootflag.o e820.o obj-y += pci-dma.o quirks.o i8237.o topology.o kdebugfs.o obj-y += alternative.o i8253.o pci-nommu.o obj-$(CONFIG_X86_64) += bugs_64.o |