Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[~andy/linux] / arch / alpha / kernel / err_marvel.c

diff --git a/arch/alpha/kernel/err_marvel.c b/arch/alpha/kernel/err_marvel.c
index 497877bf20127daad85ee837ea829eec85c982aa..413bf37eb094057b0e38e03b965764056cb11c5a 100644 (file)
--- a/arch/alpha/kernel/err_marvel.c
+++ b/arch/alpha/kernel/err_marvel.c
@@ -1152,7 +1152,7 @@ marvel_machine_check(u64 vector, u64 la_ptr)
        mb();
 }
 
-void
+void __init
 marvel_register_error_handlers(void)
 {
        ev7_register_error_handlers();