From 61a446b07619ad90fb75b0cd2531de5979daf23e Mon Sep 17 00:00:00 2001
From: isaki <isaki@NetBSD.org>
Date: Sat, 14 Jul 2007 14:13:21 +0000
Subject: [PATCH] Make it compilable after the merge of some vmlocking branch.
 OK'ed by ad@.

---
 sys/arch/x68k/dev/com.c | 7 ++++---
 sys/arch/x68k/dev/par.c | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/sys/arch/x68k/dev/com.c b/sys/arch/x68k/dev/com.c
index d46c2d4c4efd..f4d6303d71fd 100644
--- a/sys/arch/x68k/dev/com.c
+++ b/sys/arch/x68k/dev/com.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com.c,v 1.47 2007/07/14 10:46:25 ad Exp $	*/
+/*	$NetBSD: com.c,v 1.48 2007/07/14 14:13:21 isaki Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.47 2007/07/14 10:46:25 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.48 2007/07/14 14:13:21 isaki Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -148,7 +148,7 @@ struct com_softc {
 	u_char sc_ibufs[2][COM_IBUFSIZE];
 };
 
-struct callout com_poll_ch = CALLOUT_INITIALIZER;
+struct callout com_poll_ch;
 
 int comprobe(struct device *, struct cfdata *, void *);
 void comattach(struct device *, struct device *, void *);
@@ -338,6 +338,7 @@ comattach(struct device *parent, struct device *dev, void *aux)
 	com_attached = 1;
 
 	callout_init(&sc->sc_diag_ch, 0);
+	callout_init(&com_poll_ch, 0);
 
 	sc->sc_iobase = iobase;
 	sc->sc_hwflags = 0;
diff --git a/sys/arch/x68k/dev/par.c b/sys/arch/x68k/dev/par.c
index 6ae1c1d388b5..688c0368e2d4 100644
--- a/sys/arch/x68k/dev/par.c
+++ b/sys/arch/x68k/dev/par.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: par.c,v 1.33 2007/07/14 10:46:26 ad Exp $	*/
+/*	$NetBSD: par.c,v 1.34 2007/07/14 14:13:21 isaki Exp $	*/
 
 /*
  * Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: par.c,v 1.33 2007/07/14 10:46:26 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: par.c,v 1.34 2007/07/14 14:13:21 isaki Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
@@ -93,7 +93,7 @@ int parmstohz(int);
 int parsendch(struct par_softc *, u_char);
 int parsend(struct par_softc *, u_char *, int);
 
-static struct callout intr_callout = CALLOUT_INITIALIZER;
+static struct callout intr_callout;
 
 #define UNIT(x)		minor(x)
 
@@ -188,6 +188,7 @@ parattach(struct device *pdp, struct device *dp, void *aux)
 
 	callout_init(&sc->sc_timo_ch, 0);
 	callout_init(&sc->sc_start_ch, 0);
+	callout_init(&intr_callout, 0);
 }
 
 int