summaryrefslogtreecommitdiff
path: root/arch/i386
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-11 13:13:07 +0400
committerThomas Gleixner <tglx@linutronix.de>2007-10-11 13:13:07 +0400
commit668a3bf76e56f019fee46210531f94cf6b418bbd (patch)
treeced94e79cfb0766551eae1f3678527c423119517 /arch/i386
parent930eed490ca02aaad6aa1bd10614a2b70cf621c6 (diff)
downloadlinux-668a3bf76e56f019fee46210531f94cf6b418bbd.tar.xz
i386: prepare shared kernel/entry.S
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/i386')
-rw-r--r--arch/i386/kernel/Makefile2
-rw-r--r--arch/i386/kernel/entry_32.S (renamed from arch/i386/kernel/entry.S)0
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
index 0af9b0c11cb8..ff2909a97441 100644
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
@@ -4,7 +4,7 @@
extra-y := head.o init_task_32.o vmlinux.lds
-obj-y := process_32.o signal_32.o entry.o traps_32.o irq_32.o \
+obj-y := process_32.o signal_32.o entry_32.o traps_32.o irq_32.o \
ptrace_32.o time_32.o ioport_32.o ldt_32.o setup_32.o i8259_32.o sys_i386_32.o \
pci-dma_32.o i386_ksyms_32.o i387_32.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/entry.S b/arch/i386/kernel/entry_32.S
index 290b7bc82da3..290b7bc82da3 100644
--- a/arch/i386/kernel/entry.S
+++ b/arch/i386/kernel/entry_32.S