aboutsummaryrefslogtreecommitdiff
path: root/arch/m68k
diff options
context:
space:
mode:
authorGravatar Finn Thain <fthain@telegraphics.com.au> 2009-11-17 20:03:05 +1100
committerGravatar Geert Uytterhoeven <geert@linux-m68k.org> 2010-02-27 18:31:13 +0100
commit18814ee846357509ceb13d4351eec71acd007480 (patch)
tree3bd2b2d80de7c63bf68d68d7f4c2d9c0512e23a3 /arch/m68k
parentvalkyriefb: various fixes (diff)
downloadlinux-18814ee846357509ceb13d4351eec71acd007480.tar.gz
linux-18814ee846357509ceb13d4351eec71acd007480.tar.bz2
linux-18814ee846357509ceb13d4351eec71acd007480.zip
mac68k: start CUDA early
The valkyriefb driver needs the CUDA to work in order to set the video mode at boot. So initialise the device earlier, and bring the m68k code closer to the powermac code. Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/mac/config.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c
index 816452b3e50f..0356da9bf763 100644
--- a/arch/m68k/mac/config.c
+++ b/arch/m68k/mac/config.c
@@ -23,6 +23,8 @@
#include <linux/init.h>
#include <linux/vt_kern.h>
#include <linux/platform_device.h>
+#include <linux/adb.h>
+#include <linux/cuda.h>
#define BOOTINFO_COMPAT_1_0
#include <asm/setup.h>
@@ -889,6 +891,10 @@ static void __init mac_identify(void)
oss_init();
psc_init();
baboon_init();
+
+#ifdef CONFIG_ADB_CUDA
+ find_via_cuda();
+#endif
}
static void __init mac_report_hardware(void)