---

yaml --- r: 65392 b: refs/heads/master c: a0d557e h: refs/heads/master v: v3
git-mirror · Oct 11, 2007 · 6fe89bb · 6fe89bb
1 parent 11410c1
commit 6fe89bb
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: bb2c787b41d0cffd372865b474903f7b3cfcdd7e
+refs/heads/master: a0d557e2c28623c58e645c29f309a823edd7a1bf
diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile
@@ -17,7 +17,7 @@ obj-$(CONFIG_MCA)		+= mca_32.o
 obj-$(CONFIG_X86_MSR)		+= msr.o
 obj-$(CONFIG_X86_CPUID)		+= cpuid.o
 obj-$(CONFIG_MICROCODE)		+= microcode.o
-obj-$(CONFIG_APM)		+= apm.o
+obj-$(CONFIG_APM)		+= apm_32.o
 obj-$(CONFIG_X86_SMP)		+= smp_32.o smpboot_32.o tsc_sync.o
 obj-$(CONFIG_SMP)		+= smpcommon_32.o
 obj-$(CONFIG_X86_TRAMPOLINE)	+= trampoline.o

diff --git a/trunk/arch/i386/kernel/apm.c → trunk/arch/i386/kernel/apm_32.c b/trunk/arch/i386/kernel/apm.c → trunk/arch/i386/kernel/apm_32.c