diff options
Diffstat (limited to 'arch/powerpc/include/asm/machdep.h')
-rw-r--r-- | arch/powerpc/include/asm/machdep.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h index 2740c44ff717..0efdb1dfdc5f 100644 --- a/arch/powerpc/include/asm/machdep.h +++ b/arch/powerpc/include/asm/machdep.h | |||
@@ -90,7 +90,7 @@ struct machdep_calls { | |||
90 | void (*tce_flush)(struct iommu_table *tbl); | 90 | void (*tce_flush)(struct iommu_table *tbl); |
91 | 91 | ||
92 | void __iomem * (*ioremap)(phys_addr_t addr, unsigned long size, | 92 | void __iomem * (*ioremap)(phys_addr_t addr, unsigned long size, |
93 | unsigned long flags); | 93 | unsigned long flags, void *caller); |
94 | void (*iounmap)(volatile void __iomem *token); | 94 | void (*iounmap)(volatile void __iomem *token); |
95 | 95 | ||
96 | #ifdef CONFIG_PM | 96 | #ifdef CONFIG_PM |
@@ -327,8 +327,6 @@ extern void __devinit smp_generic_take_timebase(void); | |||
327 | */ | 327 | */ |
328 | /* Print a boot progress message. */ | 328 | /* Print a boot progress message. */ |
329 | void ppc64_boot_msg(unsigned int src, const char *msg); | 329 | void ppc64_boot_msg(unsigned int src, const char *msg); |
330 | /* Print a termination message (print only -- does not stop the kernel) */ | ||
331 | void ppc64_terminate_msg(unsigned int src, const char *msg); | ||
332 | 330 | ||
333 | static inline void log_error(char *buf, unsigned int err_type, int fatal) | 331 | static inline void log_error(char *buf, unsigned int err_type, int fatal) |
334 | { | 332 | { |