From 2d0592c2ec3a1e2e382e76d45bae38e2c16047de Mon Sep 17 00:00:00 2001
From: tsutsui <tsutsui@NetBSD.org>
Date: Sat, 13 Oct 2012 06:28:54 +0000
Subject: [PATCH] struct device * -> device_t, struct cfdata * -> cfdata_t 
 (from chs@)

---
 sys/arch/sun2/dev/zs.c     | 6 +++---
 sys/arch/sun2/sun2/obmem.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys/arch/sun2/dev/zs.c b/sys/arch/sun2/dev/zs.c
index d9348cfc6ae4..d0b2af243d91 100644
--- a/sys/arch/sun2/dev/zs.c
+++ b/sys/arch/sun2/dev/zs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: zs.c,v 1.20 2011/10/26 00:56:59 mrg Exp $	*/
+/*	$NetBSD: zs.c,v 1.21 2012/10/13 06:28:54 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.20 2011/10/26 00:56:59 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.21 2012/10/13 06:28:54 tsutsui Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -170,7 +170,7 @@ zs_attach(struct zsc_softc *zsc, struct zsdevice *zsd, int pri)
 	 */
 	for (channel = 0; channel < 2; channel++) {
 		struct zschan *zc;
-		struct device *child;
+		device_t child;
 
 		zsc_args.channel = channel;
 		zsc_args.hwflags = 0;
diff --git a/sys/arch/sun2/sun2/obmem.c b/sys/arch/sun2/sun2/obmem.c
index 81d55589837b..4dac8df38a1d 100644
--- a/sys/arch/sun2/sun2/obmem.c
+++ b/sys/arch/sun2/sun2/obmem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: obmem.c,v 1.17 2008/07/06 13:29:50 tsutsui Exp $	*/
+/*	$NetBSD: obmem.c,v 1.18 2012/10/13 06:28:54 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obmem.c,v 1.17 2008/07/06 13:29:50 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obmem.c,v 1.18 2012/10/13 06:28:54 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -77,7 +77,7 @@ static struct sun68k_bus_space_tag obmem_space_tag = {
 }; 
 
 static int 
-obmem_match(struct device *parent, struct cfdata *cf, void *aux)
+obmem_match(device_t parent, cfdata_t cf, void *aux)
 {
 	struct mainbus_attach_args *ma = aux;