patch-2.1.79 linux/drivers/macintosh/control.c

Next file: linux/drivers/macintosh/mac_keyb.c
Previous file: linux/drivers/macintosh/chips.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.78/linux/drivers/macintosh/control.c linux/drivers/macintosh/control.c
@@ -16,6 +16,7 @@
 #include <linux/nvram.h>
 #include <asm/prom.h>
 #include <asm/io.h>
+#include <asm/adb.h>
 #include <asm/cuda.h>
 #include <linux/selection.h>
 #include "pmac-cons.h"
@@ -377,13 +378,13 @@
 static void
 set_control_clock(unsigned char *params)
 {
-	struct cuda_request req;
+	struct adb_request req;
 	int i;
 
 	for (i = 0; i < 3; ++i) {
 		cuda_request(&req, NULL, 5, CUDA_PACKET, CUDA_GET_SET_IIC,
 			     0x50, i + 1, params[i]);
-		while (!req.got_reply)
+		while (!req.complete)
 			cuda_poll();
 	}
 }

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