From 7c1a23971b457b37339c6840c0139066f1a7f218 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:12:27 +0200 Subject: [PATCH] --- yaml --- r: 65375 b: refs/heads/master c: 549c64ac41fd37236543143a4e92699958a3972e h: refs/heads/master i: 65373: e502237ed9d6c41d99e5d02564d4288d06396e8c 65371: 19624ddd41199ca9705037214ce38ede47f23a3f 65367: 06e36ec349274e94a73ccb88d915ad9b3ec201af 65359: 64a399cabdd01c089c75f4ddf7a5b21cea745437 65343: 7bf1215a1df5ccfd750d1c5ec8b808f3be6112e2 v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/Makefile | 2 +- trunk/arch/i386/kernel/{setup.c => setup_32.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/i386/kernel/{setup.c => setup_32.c} (100%) diff --git a/[refs] b/[refs] index 4c6117b80989..faa4452b3353 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 016f8118b4f333cf88237918245be94788f0c51a +refs/heads/master: 549c64ac41fd37236543143a4e92699958a3972e diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile index 4809425113f4..a832c417b1e7 100644 --- a/trunk/arch/i386/kernel/Makefile +++ b/trunk/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/trunk/arch/i386/kernel/setup.c b/trunk/arch/i386/kernel/setup_32.c similarity index 100% rename from trunk/arch/i386/kernel/setup.c rename to trunk/arch/i386/kernel/setup_32.c