Commitable R3000Z Patch!

[Bruce M Simpson]

On Thu, Nov 11, 2004 at 03:37:42PM +0100, Gary Jennejohn wrote:
> diff -u is the preferred format for patches. With your patch it isn't
> even clear which file is being patched.

Try this (courtesy of cd2ud, from ports/devel/diffconvert, and some
style changes by hand merged back in with rediff from misc/patchutils)/

BMS
-------------- next part --------------
--- src/sys/dev/kbd/atkbdc.c.orig	Thu Nov 11 08:51:30 2004
+++ src/sys/dev/kbd/atkbdc.c	Thu Nov 11 07:42:35 2004
@@ -947,7 +947,8 @@
     int retry = KBD_MAXRETRY;
     int again = KBD_MAXWAIT;
     int c = -1;
-	
+	if (resource_disabled("atkbd", 0))
+		return 0;
     while (retry-- > 0) {
         empty_both_buffers(p, 10);
         if (write_controller_command(p, KBDC_TEST_KBD_PORT))
@@ -973,7 +974,8 @@
     int retry = KBD_MAXRETRY;
     int again = KBD_MAXWAIT;
     int c = -1;
-    
+    if (resource_disabled("atkbd", 0))
+		return 0;
     while (retry-- > 0) {
         empty_both_buffers(p, 10);
         if (write_controller_command(p, KBDC_TEST_AUX_PORT))