From acfc06ed50fc8c16d92b0d7acec41593a00f03db Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:12:23 +0200 Subject: [PATCH] --- yaml --- r: 65372 b: refs/heads/master c: 5d43542f0c223e3643d88adb05ed466e6f0c8337 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/Makefile | 2 +- trunk/arch/i386/kernel/{e820.c => e820_32.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/i386/kernel/{e820.c => e820_32.c} (100%) diff --git a/[refs] b/[refs] index 0f95856a8b69..d917df2b23e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a6424facfa0fceb57982df3a6d7e6166c94c22be +refs/heads/master: 5d43542f0c223e3643d88adb05ed466e6f0c8337 diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile index ed9f4f49a6a2..670bfdf57b6c 100644 --- a/trunk/arch/i386/kernel/Makefile +++ b/trunk/arch/i386/kernel/Makefile @@ -6,7 +6,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 \ - pci-dma_32.o i386_ksyms.o i387.o bootflag.o e820.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 obj-$(CONFIG_STACKTRACE) += stacktrace.o diff --git a/trunk/arch/i386/kernel/e820.c b/trunk/arch/i386/kernel/e820_32.c similarity index 100% rename from trunk/arch/i386/kernel/e820.c rename to trunk/arch/i386/kernel/e820_32.c