diff options
| author | markm <markm@FreeBSD.org> | 1997-11-10 18:31:35 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 1997-11-10 18:31:35 +0000 |
| commit | 1a385f5cdc52ad58db6d17799aab3177e988a213 (patch) | |
| tree | c7efd2f94120b495b46cf4aca21ce4473dea7ae5 /sys/i386/isa/sound/local.h | |
| parent | 53af1df4e61b5911f54909c98c2542da81e8479e (diff) | |
| download | FreeBSD-src-1a385f5cdc52ad58db6d17799aab3177e988a213.zip FreeBSD-src-1a385f5cdc52ad58db6d17799aab3177e988a213.tar.gz | |
Fix conflicts.
Diffstat (limited to 'sys/i386/isa/sound/local.h')
| -rw-r--r-- | sys/i386/isa/sound/local.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sys/i386/isa/sound/local.h b/sys/i386/isa/sound/local.h index 8c86bd8..e42e790 100644 --- a/sys/i386/isa/sound/local.h +++ b/sys/i386/isa/sound/local.h @@ -28,6 +28,11 @@ #define CONFIG_GUSMAX #endif +#include "sscape.h" +#if NSSCAPE != 0 && !defined(CONFIG_SSCAPE) +#define CONFIG_SSCAPE +#endif + #include "trix.h" #if NTRIX > 0 #define INCLUDE_TRIX_BOOT @@ -35,7 +40,7 @@ #define CONFIG_YM3812 #endif -#if defined(CONFIG_GUSMAX) || ( NTRIX > 0 ) +#if defined(CONFIG_GUSMAX) || ( NSSCAPE > 0 ) || ( NTRIX > 0 ) #define CONFIG_AD1848 #endif @@ -86,9 +91,7 @@ #define CONFIG_YM3812 #endif -#include "sscape.h" - -#define ALLOW_SELECT +#define ALLOW_POLL /* #undef CONFIG_PAS */ /* #undef CONFIG_ADLIB */ |
