From c2c8f269676b2310e5e130a2c541740c896e5355 Mon Sep 17 00:00:00 2001
From: nisimura <nisimura@NetBSD.org>
Date: Thu, 23 Nov 2000 09:44:14 +0000
Subject: [PATCH] - Nuke xasc_ioasic.h and xasc_pmaz.h as no code uses the
 symbols they define. - Hide #include <pmax/dev/device.h> for "pmax oldscsi"
 inside   #if NRZ > 0 || NTZ > 0.

---
 sys/arch/pmax/conf/files.pmax |  6 +++---
 sys/arch/pmax/pmax/autoconf.c | 11 ++++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/sys/arch/pmax/conf/files.pmax b/sys/arch/pmax/conf/files.pmax
index 20413f33fcbb..c259a46414fb 100644
--- a/sys/arch/pmax/conf/files.pmax
+++ b/sys/arch/pmax/conf/files.pmax
@@ -1,4 +1,4 @@
-#	$NetBSD: files.pmax,v 1.88 2000/10/10 10:25:55 ad Exp $
+#	$NetBSD: files.pmax,v 1.89 2000/11/23 09:44:14 nisimura Exp $
 # DECstation-specific configuration info
 
 # maxpartitions must be first item in files.${ARCH}.
@@ -138,9 +138,9 @@ file	arch/pmax/dev/rz.c		rz needs-count
 #
 device  xasc: ncr53c9x,scsi
 attach  xasc at tc with xasc_pmaz
-file    arch/pmax/tc/asc_pmaz.c         xasc_pmaz needs-flag
+file    arch/pmax/tc/asc_pmaz.c         xasc_pmaz
 attach  xasc at ioasic with xasc_ioasic   
-file    arch/pmax/tc/asc_ioasic.c       xasc_ioasic needs-flag
+file    arch/pmax/tc/asc_ioasic.c       xasc_ioasic
 
 
 # DC7085 (DZ-like four-port serial device) on ibus
diff --git a/sys/arch/pmax/pmax/autoconf.c b/sys/arch/pmax/pmax/autoconf.c
index 980031551adb..9d71570786a2 100644
--- a/sys/arch/pmax/pmax/autoconf.c
+++ b/sys/arch/pmax/pmax/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.55 2000/11/21 14:21:36 ad Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.56 2000/11/23 09:44:15 nisimura Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.55 2000/11/21 14:21:36 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.56 2000/11/23 09:44:15 nisimura Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -55,7 +55,6 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.55 2000/11/21 14:21:36 ad Exp $");
 #include <machine/intr.h>
 #include <machine/sysconf.h>
 
-#include <pmax/dev/device.h>
 #include <pmax/pmax/pmaxtype.h>
 
 #include <dev/tc/tcvar.h>
@@ -66,10 +65,12 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.55 2000/11/21 14:21:36 ad Exp $");
 
 #include "rz.h"
 #include "tz.h"
-#include "xasc_ioasic.h"
-#include "xasc_pmaz.h"
 #include "opt_dec_3100.h"
 
+#if NRZ > 0 || NTZ > 0
+#include <pmax/dev/device.h>
+#endif
+
 struct intrhand intrtab[MAX_DEV_NCOOKIES];
 struct device *booted_device;
 static struct device *booted_controller;