Commit 944190ac authored by Paul Mackerras's avatar Paul Mackerras Committed by Linus Torvalds

[PATCH] ppc64: fix init_boot_display link error

This patch is from Amos Waterland <apw@us.ibm.com>.

In pmac_setup.c, the function init_boot_display as currently written only
makes sense with CONFIG_BOOTX_TEXT enabled, and causes a link error if it is
not enabled.
Signed-off-by: default avatarAmos Waterland <apw@us.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b1893318
...@@ -244,7 +244,6 @@ static void btext_putc(unsigned char c) ...@@ -244,7 +244,6 @@ static void btext_putc(unsigned char c)
{ {
btext_drawchar(c); btext_drawchar(c);
} }
#endif /* CONFIG_BOOTX_TEXT */
static void __init init_boot_display(void) static void __init init_boot_display(void)
{ {
...@@ -280,6 +279,7 @@ static void __init init_boot_display(void) ...@@ -280,6 +279,7 @@ static void __init init_boot_display(void)
return; return;
} }
} }
#endif /* CONFIG_BOOTX_TEXT */
/* /*
* Early initialization. * Early initialization.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment