Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[~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 f2956ac8dccc775f60f866a24eadae130333e5fe..413bf37eb094057b0e38e03b965764056cb11c5a 100644 (file)
--- a/arch/alpha/kernel/err_marvel.c
+++ b/arch/alpha/kernel/err_marvel.c
@@ -1082,7 +1082,7 @@ marvel_machine_check(u64 vector, u64 la_ptr)
        }       
 
        /*
-        * A system event or error has occured, handle it here.
+        * A system event or error has occurred, handle it here.
         *
         * Any errors in the logout frame have already been cleared by the
         * PALcode, so just parse it.
@@ -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();