From 11410c1427e510c1c0e722b36fb86e2cbfa5a6fe Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:12:50 +0200 Subject: [PATCH] --- yaml --- r: 65391 b: refs/heads/master c: bb2c787b41d0cffd372865b474903f7b3cfcdd7e h: refs/heads/master i: 65389: 670553e64a848bdce08a8a1b0ac6d0cf23608929 65387: 9d1aebd1c5ad4361620fe9c23dddb8616c59adf5 65383: dcb43462f7d652dc9349b58133c1a3c8a0c8e3ff 65375: 7c1a23971b457b37339c6840c0139066f1a7f218 v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/Makefile | 2 +- trunk/arch/i386/kernel/{scx200.c => scx200_32.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/i386/kernel/{scx200.c => scx200_32.c} (100%) diff --git a/[refs] b/[refs] index 46ff4c5d2ac9..9f70ce8c4fc7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f5a08b90f0089604be7a03c569ad8a44085bc363 +refs/heads/master: bb2c787b41d0cffd372865b474903f7b3cfcdd7e diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile index 31c4541c4e14..0d329e12a039 100644 --- a/trunk/arch/i386/kernel/Makefile +++ b/trunk/arch/i386/kernel/Makefile @@ -45,7 +45,7 @@ obj-$(CONFIG_VMI) += vmi_32.o vmiclock_32.o obj-$(CONFIG_PARAVIRT) += paravirt_32.o obj-y += pcspeaker.o -obj-$(CONFIG_SCx200) += scx200.o +obj-$(CONFIG_SCx200) += scx200_32.o # vsyscall_32.o contains the vsyscall DSO images as __initdata. # We must build both images before we can assemble it. diff --git a/trunk/arch/i386/kernel/scx200.c b/trunk/arch/i386/kernel/scx200_32.c similarity index 100% rename from trunk/arch/i386/kernel/scx200.c rename to trunk/arch/i386/kernel/scx200_32.c