aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/x86_64/kernel/Makefile2
-rw-r--r--arch/x86_64/kernel/setup_64.c (renamed from arch/x86_64/kernel/setup.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
index fce6f3f3b4d..14316a259ae 100644
--- a/arch/x86_64/kernel/Makefile
+++ b/arch/x86_64/kernel/Makefile
@@ -5,7 +5,7 @@
extra-y := head.o head64.o init_task.o vmlinux.lds
EXTRA_AFLAGS := -traditional
obj-y := process.o signal.o entry.o traps_64.o irq.o \
- ptrace.o time.o ioport.o ldt.o setup.o i8259_64.o sys_x86_64.o \
+ ptrace.o time.o ioport.o ldt.o setup_64.o i8259_64.o sys_x86_64.o \
x8664_ksyms.o i387.o syscall.o vsyscall.o \
setup64.o bootflag.o e820_64.o reboot.o quirks.o i8237.o \
pci-dma_64.o pci-nommu.o alternative.o hpet_64.o tsc.o bugs.o \
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup_64.c
index af838f6b0b7..af838f6b0b7 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup_64.c