summaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-11 11:12:05 +0200
committerThomas Gleixner <tglx@linutronix.de>2007-10-11 11:12:05 +0200
commit7338d4357bb2c8f20e400432e1fe04a22cb868ad (patch)
treee806b9121e1d1a5a79d60d90c07de50e2c8df519 /arch/i386/kernel
parent5924be937acbd1b11adb7be9b9bfab7ceda49050 (diff)
downloadblackbird-op-linux-7338d4357bb2c8f20e400432e1fe04a22cb868ad.tar.gz
blackbird-op-linux-7338d4357bb2c8f20e400432e1fe04a22cb868ad.zip
i386: prepare shared kernel/vm86.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/vm86_32.c (renamed from arch/i386/kernel/vm86.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
index fff92c718b62..52b0041583cf 100644
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
@@ -35,7 +35,7 @@ obj-y += sysenter.o vsyscall.o
obj-$(CONFIG_ACPI_SRAT) += srat_32.o
obj-$(CONFIG_EFI) += efi.o efi_stub.o
obj-$(CONFIG_DOUBLEFAULT) += doublefault.o
-obj-$(CONFIG_VM86) += vm86.o
+obj-$(CONFIG_VM86) += vm86_32.o
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
obj-$(CONFIG_HPET_TIMER) += hpet.o
obj-$(CONFIG_K8_NB) += k8.o
diff --git a/arch/i386/kernel/vm86.c b/arch/i386/kernel/vm86_32.c
index f2dcd1d27c0a..f2dcd1d27c0a 100644
--- a/arch/i386/kernel/vm86.c
+++ b/arch/i386/kernel/vm86_32.c
OpenPOWER on IntegriCloud