diff options
author | peter <peter@FreeBSD.org> | 1999-12-06 18:26:33 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1999-12-06 18:26:33 +0000 |
commit | 7de5d2d4188cf51ce23905b7e5c99cd44523a0e4 (patch) | |
tree | 3f6b25bd5395886e713aad1c34be32f2679ab6b1 /sys/dev/sound/isa/sb8.c | |
parent | 09d56a3f8fb30923853952ed8a777819e12d5b22 (diff) | |
download | FreeBSD-src-7de5d2d4188cf51ce23905b7e5c99cd44523a0e4.zip FreeBSD-src-7de5d2d4188cf51ce23905b7e5c99cd44523a0e4.tar.gz |
Update for pnp adjustments regarding NPNP.
Also, optimize out a mess of #if's that were duplicating work already
done by config(8). For example, if a file is marked as
"dev/sound/pci/foo.c optional pcm pci" then it's only added if pcm *and*
pci are present, so #if NPCM > 0 and #if NPCI > 0 are totally redundant.
A bit more work is still needed.
Discussed with: cg (a few weeks ago)
Diffstat (limited to 'sys/dev/sound/isa/sb8.c')
-rw-r--r-- | sys/dev/sound/isa/sb8.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sys/dev/sound/isa/sb8.c b/sys/dev/sound/isa/sb8.c index 36f0c4b..bf4949a 100644 --- a/sys/dev/sound/isa/sb8.c +++ b/sys/dev/sound/isa/sb8.c @@ -32,7 +32,6 @@ */ #include <dev/sound/pcm/sound.h> -#if NPCM > 0 #include "sbc.h" @@ -1253,7 +1252,6 @@ sbmix_setrecsrc(snd_mixer *m, u_int32_t src) return src; } -#if NPNP > 0 static int sbpnp_probe(device_t dev) { @@ -1329,8 +1327,6 @@ static driver_t sbpnp_driver = { DRIVER_MODULE(sbpnp, isa, sbpnp_driver, pcm_devclass, 0, 0); -#endif /* NPNP > 0 */ - #if NSBC > 0 #define DESCSTR " PCM Audio" static int @@ -1391,7 +1387,3 @@ static driver_t sbsbc_driver = { DRIVER_MODULE(sbsbc, sbc, sbsbc_driver, pcm_devclass, 0, 0); #endif /* NSBC > 0 */ - -#endif /* NPCM > 0 */ - - |