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/gus_wave.c | |
| parent | 53af1df4e61b5911f54909c98c2542da81e8479e (diff) | |
| download | FreeBSD-src-1a385f5cdc52ad58db6d17799aab3177e988a213.zip FreeBSD-src-1a385f5cdc52ad58db6d17799aab3177e988a213.tar.gz | |
Fix conflicts.
Diffstat (limited to 'sys/i386/isa/sound/gus_wave.c')
| -rw-r--r-- | sys/i386/isa/sound/gus_wave.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/i386/isa/sound/gus_wave.c b/sys/i386/isa/sound/gus_wave.c index f1269f5..8cb3419 100644 --- a/sys/i386/isa/sound/gus_wave.c +++ b/sys/i386/isa/sound/gus_wave.c @@ -37,7 +37,7 @@ #define GUS_PNP_ID 0x100561e #define MAX_CARDS 8 -#define MAX_GUS_PNP 8 +#define MAX_GUS_PNP 12 /* Static ports */ @@ -61,7 +61,7 @@ IWAVE iw; #define MAX_SAMPLE 150 #define MAX_PATCH 256 -#define MAX_GUS_PNP 12 + u_int gus_pnp_found[MAX_GUS_PNP] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; |
