diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2006-01-12 01:06:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 09:09:06 -0800 |
| commit | a2d823bf13efea4c859376f6e85c49cfbad7ab60 (patch) | |
| tree | 0fd97fcd135e9a60adb08c62034f6fc2388120e1 /arch/m68k | |
| parent | 3c9757b7c28161e073e7f408978b7ed01925924c (diff) | |
| download | kernel_samsung_espresso10-a2d823bf13efea4c859376f6e85c49cfbad7ab60.zip kernel_samsung_espresso10-a2d823bf13efea4c859376f6e85c49cfbad7ab60.tar.gz kernel_samsung_espresso10-a2d823bf13efea4c859376f6e85c49cfbad7ab60.tar.bz2 | |
[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/m68k')
| -rw-r--r-- | arch/m68k/kernel/head.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/m68k/kernel/head.S b/arch/m68k/kernel/head.S index d4336d8..70002c1 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 |