commit cabb558714945e92000f627dda562aa5e86a31af
author Stephen Rothwell <sfr@canb.auug.org.au> Fri Sep 30 16:16:52 2005 +1000
committer Stephen Rothwell <sfr@canb.auug.org.au> Sat Oct 01 18:52:10 2005 +1000
tree 595cd75dad072224041260afb220d7fce3164e53
parent bd142b70a6bd5522f7d95f0cec06091b93bb0715

powerpc: make iSeries build

Merge vmlinux.lds.S.
Also remove arch/powerpc/kernel/vmlinux.lds which is a
generated file.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

include/asm-powerpc/system.h

diff --git a/include/asm-powerpc/system.h b/include/asm-powerpc/system.h
index 1b64879..027479d 100644
--- a/include/asm-powerpc/system.h
+++ b/include/asm-powerpc/system.h
@@ -118,10 +118,10 @@
 #endif
 
 extern void via_cuda_init(void);
-extern void pmac_nvram_init(void);
 extern void read_rtc_time(void);
 extern void pmac_find_display(void);
 extern void giveup_fpu(struct task_struct *);
+extern void disable_kernel_fp(void);
 extern void enable_kernel_fp(void);
 extern void flush_fp_to_thread(struct task_struct *);
 extern void enable_kernel_altivec(void);
@@ -346,5 +346,7 @@
 
 #define arch_align_stack(x) (x)
 
+extern unsigned long reloc_offset(void);
+
 #endif /* __KERNEL__ */
 #endif /* _ASM_POWERPC_SYSTEM_H */