Small fixes for 2.4.0test5, bk, thurs nite

[Keith Clayton]

Ran into some minor probs with 2.4.0test5 rsync'd from bk thurs night.  I
apologize if they've already been fixed . . just getting around to
compiling the source this morning.

I've attached two patches, first against pmac_time.c which fixes a problem
when CONGIG_ADB_PMU is not set (in my case)

The second fixes a few bad defs in adbhid.c



<><><><><><><><><><><><>
Keith Clayton
kclayton at jps.net

*************************************************************************
*                      Have GPG?  Use it!                               *
*                                                                       *
* Why encrypt?  See my rant at http://www.jps.net/kclayton/encrypt.html *
*                                                                       *
* Public key: http://www.jps.net/kclayton/keith_public_key.html         *
* Or pull it from: http://www.keyserver.net                             *
*                                                                       *
* Key fingerprint = 0C47 F1A1 0434 588C 9457  D53F D86A 5449 43F6 09A0  *
*************************************************************************

-------------- next part --------------
--- adbhid.c.orig	Sat Aug 12 08:09:04 2000
+++ adbhid.c	Sat Aug 12 08:19:29 2000
@@ -129,9 +129,9 @@
 	if (nb != 3 || (data[0] & 3) != KEYB_KEYREG)
 		return;		/* ignore it */
 	kbd_pt_regs = regs;
-	input_keycode(id, data[1], 0);
+	adbhid_input_keycode(id, data[1], 0);
 	if (!(data[2] == 0xff || (data[2] == 0x7f && data[1] == 0x7f)))
-		input_keycode(id, data[2], 0);
+		adbhid_input_keycode(id, data[2], 0);
 }
 
 static void
-------------- next part --------------
--- pmac_time.c.orig	Sat Aug 12 07:59:19 2000
+++ pmac_time.c	Sat Aug 12 08:01:05 2000
@@ -133,6 +133,7 @@
 			printk(KERN_ERR "pmac_set_rtc_time: got %d byte reply\n",
 			       req.reply_len);
 		return 1;
+#ifdef CONFIG_ADB_PMU
 	case SYS_CTRLER_PMU:
 		if (pmu_request(&req, NULL, 5, PMU_SET_RTC,
 				nowtime >> 24, nowtime >> 16, nowtime >> 8, nowtime) < 0)
@@ -143,6 +144,7 @@
 			printk(KERN_ERR "pmac_set_rtc_time: got %d byte reply\n",
 			       req.reply_len);
 		return 1;
+#endif /*CONFIG_ADB_PMU */
 	default:
 		return 0;
 	}