aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/mac
diff options
context:
space:
mode:
authorFinn Thain <fthain@telegraphics.com.au>2009-11-17 04:03:05 -0500
committerGeert Uytterhoeven <geert@linux-m68k.org>2010-02-27 12:31:13 -0500
commit18814ee846357509ceb13d4351eec71acd007480 (patch)
tree3bd2b2d80de7c63bf68d68d7f4c2d9c0512e23a3 /arch/m68k/mac
parent11e8faca2e501c25d2f98c1b9534776a9a9704c5 (diff)
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/mac')
-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 @@
23#include <linux/init.h> 23#include <linux/init.h>
24#include <linux/vt_kern.h> 24#include <linux/vt_kern.h>
25#include <linux/platform_device.h> 25#include <linux/platform_device.h>
26#include <linux/adb.h>
27#include <linux/cuda.h>
26 28
27#define BOOTINFO_COMPAT_1_0 29#define BOOTINFO_COMPAT_1_0
28#include <asm/setup.h> 30#include <asm/setup.h>
@@ -889,6 +891,10 @@ static void __init mac_identify(void)
889 oss_init(); 891 oss_init();
890 psc_init(); 892 psc_init();
891 baboon_init(); 893 baboon_init();
894
895#ifdef CONFIG_ADB_CUDA
896 find_via_cuda();
897#endif
892} 898}
893 899
894static void __init mac_report_hardware(void) 900static void __init mac_report_hardware(void)