diff -Nru a/arch/ppc64/kernel/prom.c b/arch/ppc64/kernel/prom.c
--- a/arch/ppc64/kernel/prom.c	Tue Nov 11 15:25:08 2003
+++ b/arch/ppc64/kernel/prom.c	Tue Nov 11 15:25:08 2003
@@ -191,7 +191,7 @@
 struct {
 	unsigned int pir;
 	unsigned int threadid;
-} hmt_thread_data[NR_CPUS] = {0};
+} hmt_thread_data[NR_CPUS] = {{0}};
 #endif /* CONFIG_HMT */

 char testString[] = "LINUX\n";
@@ -1575,7 +1575,7 @@
 	}

 	/* Add a "linux_phandle" value */
-        if (np->node != NULL) {
+        if (np->node) {
 		u32 ibm_phandle = 0;
 		int len;

diff -Nru a/include/asm-ppc64/system.h b/include/asm-ppc64/system.h
--- a/include/asm-ppc64/system.h	Tue Nov 11 15:25:08 2003
+++ b/include/asm-ppc64/system.h	Tue Nov 11 15:25:08 2003
@@ -82,6 +82,7 @@
 extern void show_regs(struct pt_regs * regs);
 extern void flush_instruction_cache(void);
 extern int _get_PVR(void);
+extern unsigned long _get_PIR(void);
 extern void giveup_fpu(struct task_struct *);
 extern void disable_kernel_fp(void);
 extern void enable_kernel_fp(void);
diff -Nru a/include/linux/proc_fs.h b/include/linux/proc_fs.h
--- a/include/linux/proc_fs.h	Tue Nov 11 15:25:08 2003
+++ b/include/linux/proc_fs.h	Tue Nov 11 15:25:08 2003
@@ -131,8 +131,11 @@
 /*
  * proc_devtree.c
  */
+#ifdef CONFIG_PROC_DEVICETREE
+struct device_node;
 extern void proc_device_tree_init(void);
 extern void proc_device_tree_add_node(struct device_node *, struct proc_dir_entry *);
+#endif /* CONFIG_PROC_DEVICETREE */

 /*
  * proc_rtas.c