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 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
microblaze
/
include
/
asm
/
setup.h
diff --git
a/arch/microblaze/include/asm/setup.h
b/arch/microblaze/include/asm/setup.h
index
27f8daf
..
ed67c9e
100644
(file)
--- a/
arch/microblaze/include/asm/setup.h
+++ b/
arch/microblaze/include/asm/setup.h
@@
-38,7
+38,7
@@
extern void early_console_reg_tlb_alloc(unsigned int addr);
void time_init(void);
void init_IRQ(void);
void machine_early_init(const char *cmdline, unsigned int ram,
-
unsigned int fdt
);
+
unsigned int fdt, unsigned int msr
);
void machine_restart(char *cmd);
void machine_shutdown(void);