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>

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c
index d840a109f833..1c4ee6e77937 100644
--- a/drivers/macintosh/adb.c
+++ b/drivers/macintosh/adb.c
@@ -317,9 +317,11 @@ static int __init adb_init(void)
                         break;
                 }
         }
-        if ((adb_controller == NULL) || adb_controller->init()) {
-                printk(KERN_WARNING "Warning: no ADB interface detected\n");
+        if (adb_controller != NULL && adb_controller->init &&
+            adb_controller->init())
                 adb_controller = NULL;
+        if (adb_controller == NULL) {
+                printk(KERN_WARNING "Warning: no ADB interface detected\n");
         } else {
 #ifdef CONFIG_PPC
                 if (of_machine_is_compatible("AAPL,PowerBook1998") ||