summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2006-01-12 12:06:40 +0300
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-12 20:09:06 +0300
commita2d823bf13efea4c859376f6e85c49cfbad7ab60 (patch)
tree0fd97fcd135e9a60adb08c62034f6fc2388120e1 /arch
parent3c9757b7c28161e073e7f408978b7ed01925924c (diff)
downloadlinux-a2d823bf13efea4c859376f6e85c49cfbad7ab60.tar.xz
[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>
Diffstat (limited to 'arch')
-rw-r--r--arch/m68k/kernel/head.S2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/m68k/kernel/head.S b/arch/m68k/kernel/head.S
index d4336d846df1..70002c146eed 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