Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev

[karo-tx-linux.git] / arch / microblaze / include / asm / setup.h

diff --git a/arch/microblaze/include/asm/setup.h b/arch/microblaze/include/asm/setup.h
index 27f8dafd8c34b25f9f2b2463a62b025611d8de14..ed67c9ed15b8346f8752ff506b59ffe6e43afe17 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);