---

yaml --- r: 148670 b: refs/heads/master c: 08687ae h: refs/heads/master v: v3
git-mirror · Jun 12, 2009 · 05583e9 · 05583e9
1 parent 8258137
commit 05583e9
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 261 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d48becd33a7921694ba1955ba91604d648020f1
+refs/heads/master: 08687aec71bc9134fe336e561f6877bacf74fc0a
diff --git a/trunk/arch/x86/power/Makefile b/trunk/arch/x86/power/Makefile
@@ -3,5 +3,5 @@
 nostackp := $(call cc-option, -fno-stack-protector)
 CFLAGS_cpu_$(BITS).o	:= $(nostackp)
 
-obj-$(CONFIG_PM_SLEEP)		+= cpu_$(BITS).o
+obj-$(CONFIG_PM_SLEEP)		+= cpu.o
 obj-$(CONFIG_HIBERNATION)	+= hibernate_$(BITS).o hibernate_asm_$(BITS).o
diff --git a/trunk/arch/x86/power/cpu_64.c → trunk/arch/x86/power/cpu.c b/trunk/arch/x86/power/cpu_64.c → trunk/arch/x86/power/cpu.c
diff --git a/trunk/arch/x86/power/cpu_32.c b/trunk/arch/x86/power/cpu_32.c