diff --git a/[refs] b/[refs] index 9b00a670583c..3aced2ffd7cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 109b60f0bc1306192c765875badcaa5f3850a0a1 +refs/heads/master: 124d795d16b018b054956c9be561f889acf95ac4 diff --git a/trunk/arch/powerpc/platforms/powermac/udbg_adb.c b/trunk/arch/powerpc/platforms/powermac/udbg_adb.c index b1882e40525a..44e0b55a2a02 100644 --- a/trunk/arch/powerpc/platforms/powermac/udbg_adb.c +++ b/trunk/arch/powerpc/platforms/powermac/udbg_adb.c @@ -149,7 +149,7 @@ static void udbg_adb_putc(char c) return udbg_adb_old_putc(c); } -void udbg_adb_init_early(void) +void __init udbg_adb_init_early(void) { #ifdef CONFIG_BOOTX_TEXT if (btext_find_display(1) == 0) { @@ -159,7 +159,7 @@ void udbg_adb_init_early(void) #endif } -int udbg_adb_init(int force_btext) +int __init udbg_adb_init(int force_btext) { struct device_node *np;