From: Al Viro <viro@ftp.linux.org.uk>
Date: Thu, 12 Jan 2006 09:06:40 +0000 (-0800)
Subject: [PATCH] m68k: console code in head.S needs framebuffer support built in
X-Git-Tag: v2.6.16-rc1~186
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a2d823bf13efea4c859376f6e85c49cfbad7ab60;p=linux-2.6-omap-h63xx.git

[PATCH] m68k: console code in head.S needs framebuffer support built in

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/arch/m68k/kernel/head.S b/arch/m68k/kernel/head.S
index d4336d846df..70002c146ee 100644
--- a/arch/m68k/kernel/head.S
+++ b/arch/m68k/kernel/head.S
@@ -273,8 +273,10 @@
  * Macintosh console support
  */
 
+#ifdef CONFIG_FRAMEBUFFER_CONSOLE
 #define CONSOLE
 #define CONSOLE_PENGUIN
+#endif
 
 /*
  * Macintosh serial debug support; outputs boot info to the printer