patch-2.1.101 linux/drivers/macintosh/adb.c

Next file: linux/drivers/macintosh/aty.c
Previous file: linux/drivers/macintosh/Makefile
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.100/linux/drivers/macintosh/adb.c linux/drivers/macintosh/adb.c
@@ -17,8 +17,9 @@
 #include <asm/pmu.h>
 #include <asm/uaccess.h>
 #include <asm/hydra.h>
+#include <asm/init.h>
 
-enum adb_hw adb_hardware;
+enum adb_hw adb_hardware = ADB_NONE;
 int (*adb_send_request)(struct adb_request *req, int sync);
 int (*adb_autopoll)(int on);
 static void adb_scan_bus(void);
@@ -29,6 +30,8 @@
 	int handler_id;
 } adb_handler[16];
 
+__openfirmware
+
 static int adb_nodev(void)
 {
 	return -1;
@@ -137,7 +140,6 @@
 
 void adb_init(void)
 {
-	adb_hardware = ADB_NONE;
 	adb_send_request = (void *) adb_nodev;
 	adb_autopoll = (void *) adb_nodev;
 	if ( (_machine != _MACH_chrp) && (_machine != _MACH_Pmac) )

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov