---

yaml --- r: 11656 b: refs/heads/master c: 03501da h: refs/heads/master v: v3
git-mirror · Oct 26, 2005 · 8e93b12 · 8e93b12
1 parent c874902
commit 8e93b12
Show file tree

Hide file tree

Showing 5 changed files with 418 additions and 249 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 033ef338b6e007dc081c6282a4f2a9dd761f8cd2
+refs/heads/master: 03501dab035ab7da5e1373f5e130cfd6346d3f21
diff --git a/trunk/arch/powerpc/kernel/Makefile b/trunk/arch/powerpc/kernel/Makefile
@@ -32,7 +32,7 @@ extra-$(CONFIG_PPC_FPU)		+= fpu.o
 extra-y				+= vmlinux.lds
 
 obj-y				+= process.o init_task.o time.o \
-				   prom.o systbl.o traps.o
+				   prom.o systbl.o traps.o setup-common.o
 obj-$(CONFIG_PPC32)		+= entry_32.o idle_6xx.o setup_32.o misc_32.o
 obj-$(CONFIG_PPC64)		+= setup_64.o misc_64.o
 obj-$(CONFIG_PPC_OF)		+= prom_init.o

diff --git a/trunk/arch/powerpc/kernel/ppc_ksyms.c b/trunk/arch/powerpc/kernel/ppc_ksyms.c
@@ -14,7 +14,6 @@
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/ide.h>
-#include <linux/pm.h>
 #include <linux/bitops.h>
 
 #include <asm/page.h>
@@ -231,7 +230,6 @@ EXPORT_SYMBOL(screen_info);
 #endif
 
 #ifdef CONFIG_PPC32
-EXPORT_SYMBOL(pm_power_off);
 EXPORT_SYMBOL(__delay);
 EXPORT_SYMBOL(timer_interrupt);
 EXPORT_SYMBOL(irq_desc);