git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfs
[pandora-kernel.git]
/
arch
/
powerpc
/
include
/
asm
/
machdep.h
diff --git
a/arch/powerpc/include/asm/machdep.h
b/arch/powerpc/include/asm/machdep.h
index
2740c44
..
0efdb1d
100644
(file)
--- a/
arch/powerpc/include/asm/machdep.h
+++ b/
arch/powerpc/include/asm/machdep.h
@@
-90,7
+90,7
@@
struct machdep_calls {
void (*tce_flush)(struct iommu_table *tbl);
void __iomem * (*ioremap)(phys_addr_t addr, unsigned long size,
void (*tce_flush)(struct iommu_table *tbl);
void __iomem * (*ioremap)(phys_addr_t addr, unsigned long size,
- unsigned long flags);
+ unsigned long flags
, void *caller
);
void (*iounmap)(volatile void __iomem *token);
#ifdef CONFIG_PM
void (*iounmap)(volatile void __iomem *token);
#ifdef CONFIG_PM
@@
-327,8
+327,6
@@
extern void __devinit smp_generic_take_timebase(void);
*/
/* Print a boot progress message. */
void ppc64_boot_msg(unsigned int src, const char *msg);
*/
/* Print a boot progress message. */
void ppc64_boot_msg(unsigned int src, const char *msg);
-/* Print a termination message (print only -- does not stop the kernel) */
-void ppc64_terminate_msg(unsigned int src, const char *msg);
static inline void log_error(char *buf, unsigned int err_type, int fatal)
{
static inline void log_error(char *buf, unsigned int err_type, int fatal)
{