From 2a67c3d6a102b776d158491552940fdd09597c55 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:11:50 +0200 Subject: [PATCH] --- yaml --- r: 65348 b: refs/heads/master c: d07ec74041a48f2ce47aa254e716e1e2c17a1191 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/Makefile | 2 +- trunk/arch/i386/kernel/{i8253.c => i8253_32.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/i386/kernel/{i8253.c => i8253_32.c} (100%) diff --git a/[refs] b/[refs] index c893b40dd7cc..f45d4f26fb4c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6513b15625b19abf8397a1a7099a61c453783e01 +refs/heads/master: d07ec74041a48f2ce47aa254e716e1e2c17a1191 diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile index a0bd5aa66e15..0d09d8812238 100644 --- a/trunk/arch/i386/kernel/Makefile +++ b/trunk/arch/i386/kernel/Makefile @@ -7,7 +7,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.o sys_i386.o \ pci-dma.o i386_ksyms.o i387.o bootflag.o e820.o\ - quirks.o i8237.o topology.o alternative.o i8253.o tsc.o + quirks.o i8237.o topology.o alternative.o i8253_32.o tsc.o obj-$(CONFIG_STACKTRACE) += stacktrace.o obj-y += cpu/ diff --git a/trunk/arch/i386/kernel/i8253.c b/trunk/arch/i386/kernel/i8253_32.c similarity index 100% rename from trunk/arch/i386/kernel/i8253.c rename to trunk/arch/i386/kernel/i8253_32.c