---

yaml --- r: 65391 b: refs/heads/master c: bb2c787 h: refs/heads/master i: 65389: 670553e 65387: 9d1aebd 65383: dcb4346 65375: 7c1a239 v: v3
git-mirror · Oct 11, 2007 · 11410c1 · 11410c1
1 parent 047a609
commit 11410c1
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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 → trunk/arch/i386/kernel/scx200_32.c b/trunk/arch/i386/kernel/scx200.c → trunk/arch/i386/kernel/scx200_32.c