summaryrefslogtreecommitdiff
path: root/arch/i386/kernel
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-11 11:12:27 +0200
committerThomas Gleixner <tglx@linutronix.de>2007-10-11 11:12:27 +0200
commit549c64ac41fd37236543143a4e92699958a3972e (patch)
tree7c71670a572d08a35edcdd35d24e5c6a2411a074 /arch/i386/kernel
parent016f8118b4f333cf88237918245be94788f0c51a (diff)
i386: prepare shared kernel/setup.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/i386/kernel')
-rw-r--r--arch/i386/kernel/Makefile2
-rw-r--r--arch/i386/kernel/setup_32.c (renamed from arch/i386/kernel/setup.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
index 4809425113f4..a832c417b1e7 100644
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
@@ -5,7 +5,7 @@
extra-y := head.o init_task.o vmlinux.lds
obj-y := process.o signal.o entry.o traps_32.o irq.o \
- ptrace.o time.o ioport.o ldt.o setup.o i8259_32.o sys_i386_32.o \
+ ptrace.o time.o ioport.o ldt.o setup_32.o i8259_32.o sys_i386_32.o \
pci-dma_32.o i386_ksyms.o i387.o bootflag.o e820_32.o\
quirks.o i8237.o topology.o alternative.o i8253_32.o tsc.o
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup_32.c
index d474cd639bcb..d474cd639bcb 100644
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup_32.c