From c30501e798fad2be81379bac98b6cfe731308f94 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 11 Oct 2007 11:14:31 +0200
Subject: [PATCH] x86_64: prepare shared kernel/setup.c

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 arch/x86_64/kernel/Makefile                | 2 +-
 arch/x86_64/kernel/{setup.c => setup_64.c} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename arch/x86_64/kernel/{setup.c => setup_64.c} (100%)

diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
index fce6f3f3b4d6..14316a259aea 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
similarity index 100%
rename from arch/x86_64/kernel/setup.c
rename to arch/x86_64/kernel/setup_64.c
-- 
2.20.1