From c995b60eeb60ae2143a727d86eaeee0c158f9557 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:14:31 +0200 Subject: [PATCH] --- yaml --- r: 65467 b: refs/heads/master c: c30501e798fad2be81379bac98b6cfe731308f94 h: refs/heads/master i: 65465: 4f073ab60385f324873005cf1849fed59cbe2a35 65463: 150fa6fb3fb4ab6ae116beab2df5eaee615c8ac6 v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/Makefile | 2 +- trunk/arch/x86_64/kernel/{setup.c => setup_64.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/x86_64/kernel/{setup.c => setup_64.c} (100%) diff --git a/[refs] b/[refs] index d2ad92c09c0f..1b31ba7694ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b022a67921723774a2d2fa018dfd9a5e5c3c90f +refs/heads/master: c30501e798fad2be81379bac98b6cfe731308f94 diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/arch/x86_64/kernel/Makefile index fce6f3f3b4d6..14316a259aea 100644 --- a/trunk/arch/x86_64/kernel/Makefile +++ b/trunk/arch/x86_64/kernel/Makefile @@ -5,7 +5,7 @@ extra-y := head.o head64.o init_task.o vmlinux.lds EXTRA_AFLAGS := -traditional obj-y := process.o signal.o entry.o traps_64.o irq.o \ - ptrace.o time.o ioport.o ldt.o setup.o i8259_64.o sys_x86_64.o \ + ptrace.o time.o ioport.o ldt.o setup_64.o i8259_64.o sys_x86_64.o \ x8664_ksyms.o i387.o syscall.o vsyscall.o \ setup64.o bootflag.o e820_64.o reboot.o quirks.o i8237.o \ pci-dma_64.o pci-nommu.o alternative.o hpet_64.o tsc.o bugs.o \ diff --git a/trunk/arch/x86_64/kernel/setup.c b/trunk/arch/x86_64/kernel/setup_64.c similarity index 100% rename from trunk/arch/x86_64/kernel/setup.c rename to trunk/arch/x86_64/kernel/setup_64.c