[PATCH] PPC64 Fix init_boot_display link error

From: Paul Mackerras
Date: Mon Mar 07 2005 - 04:09:11 EST


This patch is from Amos Waterland <apw@xxxxxxxxxx>.

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: Amos Waterland <apw@xxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>

--- 1.15/arch/ppc64/kernel/pmac_setup.c 2005-01-08 00:43:52 -05:00
+++ edited/arch/ppc64/kernel/pmac_setup.c 2005-03-02 19:37:31 -05:00
@@ -244,7 +244,6 @@
{
btext_drawchar(c);
}
-#endif /* CONFIG_BOOTX_TEXT */

static void __init init_boot_display(void)
{
@@ -280,6 +279,7 @@
return;
}
}
+#endif /* CONFIG_BOOTX_TEXT */

/*
* Early initialization.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/