diff options
author | Paul Mackerras <paulus@samba.org> | 2007-07-26 16:43:24 +1000 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-07-26 16:43:24 +1000 |
commit | 46b2835771ad8ef19b8e081e8c90439408c7645f (patch) | |
tree | 4059e1949df40d6c9078bcbe6783b03384ba61f3 /arch/powerpc/kernel/udbg.c | |
parent | 9d78592ed72dbff1d8825207f8def07858a49768 (diff) | |
parent | 141707892e92dca69b7b8af65b9367da2d1f8120 (diff) | |
download | kernel-crypto-46b2835771ad8ef19b8e081e8c90439408c7645f.tar.gz kernel-crypto-46b2835771ad8ef19b8e081e8c90439408c7645f.tar.xz kernel-crypto-46b2835771ad8ef19b8e081e8c90439408c7645f.zip |
Merge branch 'fixes-2.6.23' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge
Diffstat (limited to 'arch/powerpc/kernel/udbg.c')
-rw-r--r-- | arch/powerpc/kernel/udbg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/udbg.c b/arch/powerpc/kernel/udbg.c index cbca1df8bc6..0f9b4eadfbc 100644 --- a/arch/powerpc/kernel/udbg.c +++ b/arch/powerpc/kernel/udbg.c @@ -155,7 +155,7 @@ static int early_console_initialized; * Called by setup_system after ppc_md->probe and ppc_md->early_init. * Call it again after setting udbg_putc in ppc_md->setup_arch. */ -void register_early_udbg_console(void) +void __init register_early_udbg_console(void) { if (early_console_initialized) return; |