From f7fdb354fff077246e6ca493b602ffdb11d099bd Mon Sep 17 00:00:00 2001 From: John-Mark Gurney Date: Mon, 15 Sep 1997 06:35:13 +0000 Subject: [PATCH] add some preprocessor lines to prevent both controler snd0 and device pcm0 from being loaded into the kernel at the same time. As this generates compilation errors, I just error out. Requested-by: Jordan --- sys/i386/isa/snd/sound.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/i386/isa/snd/sound.c b/sys/i386/isa/snd/sound.c index a9b5fd55666..fcd5e397204 100644 --- a/sys/i386/isa/snd/sound.c +++ b/sys/i386/isa/snd/sound.c @@ -54,6 +54,11 @@ #if NPCM > 0 /* from "snd.h" */ +#include "snd.h" +#if NSND > 0 +#error Can't have both Luigi's (pcm0) and voxware (snd0) at the same time. +#endif + #define SNDSTAT_BUF_SIZE 4000 static char status_buf[SNDSTAT_BUF_SIZE] ; static int status_len = 0 ;