aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/i386/Makefile2
-rw-r--r--arch/i386/kernel/Makefile2
-rw-r--r--arch/i386/kernel/head_32.S (renamed from arch/i386/kernel/head.S)0
3 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index 56ea4250f982..45409c13f6ef 100644
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -99,7 +99,7 @@ core-$(CONFIG_XEN) += arch/i386/xen/
99# default subarch .h files 99# default subarch .h files
100mflags-y += -Iinclude/asm-i386/mach-default 100mflags-y += -Iinclude/asm-i386/mach-default
101 101
102head-y := arch/i386/kernel/head.o arch/i386/kernel/init_task_32.o 102head-y := arch/i386/kernel/head_32.o arch/i386/kernel/init_task_32.o
103 103
104libs-y += arch/i386/lib/ 104libs-y += arch/i386/lib/
105core-y += arch/i386/kernel/ \ 105core-y += arch/i386/kernel/ \
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
index d5367aa2510d..6ecf97da63b0 100644
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
@@ -2,7 +2,7 @@
2# Makefile for the linux kernel. 2# Makefile for the linux kernel.
3# 3#
4 4
5extra-y := head.o init_task_32.o vmlinux.lds 5extra-y := head_32.o init_task_32.o vmlinux.lds
6 6
7obj-y := process_32.o signal_32.o entry_32.o traps_32.o irq_32.o \ 7obj-y := process_32.o signal_32.o entry_32.o traps_32.o irq_32.o \
8 ptrace_32.o time_32.o ioport_32.o ldt_32.o setup_32.o i8259_32.o sys_i386_32.o \ 8 ptrace_32.o time_32.o ioport_32.o ldt_32.o setup_32.o i8259_32.o sys_i386_32.o \
diff --git a/arch/i386/kernel/head.S b/arch/i386/kernel/head_32.S
index 8f0382161c91..8f0382161c91 100644
--- a/arch/i386/kernel/head.S
+++ b/arch/i386/kernel/head_32.S