Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6-omap-h63xx.git] / arch / alpha / kernel / err_titan.c

diff --git a/arch/alpha/kernel/err_titan.c b/arch/alpha/kernel/err_titan.c
index 543d96d7fa2b6f32d1629812fc269e149e1677f4..257449ed15efca1ac97d46e999acb0e223e62408 100644 (file)
--- a/arch/alpha/kernel/err_titan.c
+++ b/arch/alpha/kernel/err_titan.c
@@ -564,7 +564,7 @@ static struct el_subpacket_handler titan_subpacket_handler =
        SUBPACKET_HANDLER_INIT(EL_CLASS__REGATTA_FAMILY, 
                               el_process_regatta_subpacket);
 
-void
+void __init
 titan_register_error_handlers(void)
 {
        size_t i;
@@ -591,7 +591,7 @@ privateer_process_680_frame(struct el_common *mchk_header, int print)
                (struct el_PRIVATEER_envdata_mcheck *)
                ((unsigned long)mchk_header + mchk_header->sys_offset);
 
-       /* TODO - catagorize errors, for now, no error */
+       /* TODO - categorize errors, for now, no error */
 
        if (!print)
                return status;