From 722e860eb084ecd751c161597e0b83cbe4328c4e Mon Sep 17 00:00:00 2001
From: KATO Takenori <kato@FreeBSD.org>
Date: Fri, 28 Aug 1998 12:47:45 +0000
Subject: [PATCH] Sync with sys/i386/isa/if_ed.c and spkr.c revisions 1.35 and
 1.144, respectively.

---
 sys/pc98/pc98/if_ed.c | 4 ++--
 sys/pc98/pc98/spkr.c  | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/sys/pc98/pc98/if_ed.c b/sys/pc98/pc98/if_ed.c
index 9b14231900d..4ff5cce8621 100644
--- a/sys/pc98/pc98/if_ed.c
+++ b/sys/pc98/pc98/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.49 1998/06/17 16:29:27 kato Exp $
+ *	$Id: if_ed.c,v 1.50 1998/06/22 08:06:58 kato Exp $
  */
 
 /*
@@ -4252,7 +4252,7 @@ edpnp_probe(u_long csn, u_long vend_id)
 		struct pnp_cinfo d;
 		read_pnp_parms(&d, 0);
 		if (d.enable == 0 || d.flags & 1) {
-			printf("CSN %d is disabled.\n", csn);
+			printf("CSN %lu is disabled.\n", csn);
 			return (NULL);
 		}
 
diff --git a/sys/pc98/pc98/spkr.c b/sys/pc98/pc98/spkr.c
index 9ee9942abcb..4121a17cf95 100644
--- a/sys/pc98/pc98/spkr.c
+++ b/sys/pc98/pc98/spkr.c
@@ -4,7 +4,7 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- *    $Id: spkr.c,v 1.12 1998/02/21 15:51:51 kato Exp $
+ *    $Id: spkr.c,v 1.13 1998/06/08 08:55:45 kato Exp $
  */
 
 /*
@@ -573,13 +573,14 @@ spkrclose(dev, flags, fmt, p)
 int
 spkrioctl(dev, cmd, cmdarg, flags, p)
 	dev_t		dev;
-	u_long		cmd;
+	unsigned long	cmd;
 	caddr_t		cmdarg;
 	int		flags;
 	struct proc	*p;
 {
 #ifdef DEBUG
-    (void) printf("spkrioctl: entering with dev = %x, cmd = %x\n");
+    (void) printf("spkrioctl: entering with dev = %lx, cmd = %lx\n",
+    	(unsigned long)dev, cmd);
 #endif /* DEBUG */
 
     if (minor(dev) != 0)