diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-01-30 13:30:14 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:30:14 +0100 |
| commit | 77e463d1040d6310211ac5162729f5d4afc4dd8c (patch) | |
| tree | 98b1a10bd33bcee97348bd5e8576b91d4f09d4ec /arch/x86/kernel/Makefile_64 | |
| parent | 70f5088dd5e9fbd3a71b3a5b01395c676158194b (diff) | |
| download | op-kernel-dev-77e463d1040d6310211ac5162729f5d4afc4dd8c.zip op-kernel-dev-77e463d1040d6310211ac5162729f5d4afc4dd8c.tar.gz | |
x86: merge arch/x86/kernel/ldt_32/64.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/Makefile_64')
| -rw-r--r-- | arch/x86/kernel/Makefile_64 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/Makefile_64 b/arch/x86/kernel/Makefile_64 index 08a68f0..9cb3df2 100644 --- a/arch/x86/kernel/Makefile_64 +++ b/arch/x86/kernel/Makefile_64 @@ -7,7 +7,7 @@ CPPFLAGS_vmlinux.lds += -Ux86_64 EXTRA_AFLAGS := -traditional obj-y := process_64.o signal_64.o entry_64.o traps_64.o irq_64.o \ - ptrace_64.o time_64.o ioport_64.o ldt_64.o setup_64.o i8259_64.o sys_x86_64.o \ + ptrace_64.o time_64.o ioport_64.o ldt.o setup_64.o i8259_64.o sys_x86_64.o \ x8664_ksyms_64.o i387_64.o syscall_64.o vsyscall_64.o \ setup64.o bootflag.o e820_64.o reboot_64.o quirks.o i8237.o \ pci-dma_64.o pci-nommu_64.o alternative.o hpet.o tsc_64.o bugs_64.o \ |
