From e9b998f0be2308bb79f21578a3b052598ec1b5db Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Wed, 17 Jun 1998 16:54:22 +0000
Subject: [PATCH] Don't depend on <sys/conf.h> declaring isa device structs or
 isa interrupt handlers.  pcm is not in LINT, so it is hard to test.

---
 sys/i386/isa/isa_device.h | 3 ++-
 sys/i386/isa/snd/sound.c  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys/i386/isa/isa_device.h b/sys/i386/isa/isa_device.h
index 03373b358de..3b315dae5ce 100644
--- a/sys/i386/isa/isa_device.h
+++ b/sys/i386/isa/isa_device.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa_device.h	7.1 (Berkeley) 5/9/91
- *	$Id: isa_device.h,v 1.48 1998/06/17 14:58:01 bde Exp $
+ *	$Id: isa_device.h,v 1.49 1998/06/17 16:32:23 kato Exp $
  */
 
 #ifndef _I386_ISA_ISA_DEVICE_H_
@@ -154,6 +154,7 @@ inthand2_t	mseintr;
 inthand2_t	ncaintr;
 inthand2_t	npxintr;
 inthand2_t	pasintr;
+inthand2_t	pcmintr;
 inthand2_t	pcrint;
 inthand2_t	ppcintr;
 inthand2_t	psmintr;
diff --git a/sys/i386/isa/snd/sound.c b/sys/i386/isa/snd/sound.c
index 72577156025..2e86e201970 100644
--- a/sys/i386/isa/snd/sound.c
+++ b/sys/i386/isa/snd/sound.c
@@ -57,8 +57,9 @@
 #include <sys/devfsext.h>
 #endif /* DEVFS */
 
+#if NPCM > 0	/* from "pcm.h" via disgusting #include in snd/sound.h */
 
-#if NPCM > 0	/* from "snd.h" */
+extern struct isa_driver pcmdriver;
 
 #define SNDSTAT_BUF_SIZE        4000
 static char status_buf[SNDSTAT_BUF_SIZE] ;