lkml.org 
[lkml]   [2000]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: 2.3.99pre2 compile problem for sound blaster

[snip]

> drivers/sound/sounddrivers.o: In function `sb_dsp_unload':
> drivers/sound/sounddrivers.o(.text+0x3056): undefined reference to
> `sbmixnum'
> make: *** [vmlinux] Error 1

Ok, my fault. I only tested my patch with sound built modularly, not built
into the kernel. Try this patch, made against 2.3.99pre2-4, and let me
know if it works for you.

Thanks,
Paul Laufer
diff -urN linux-devel-virgin/drivers/sound/sb.h linux/drivers/sound/sb.h
--- linux-devel-virgin/drivers/sound/sb.h Tue Mar 7 13:40:24 2000
+++ linux/drivers/sound/sb.h Sat Mar 18 14:47:10 2000
@@ -151,6 +151,7 @@
int sb_dsp_init (struct address_info *hw_config);
void sb_dsp_unload(struct address_info *hw_config, int sbmpu);
int sb_mixer_init(sb_devc *devc);
+int sb_mixer_unload(sb_devc *devc);
void sb_mixer_set_stereo (sb_devc *devc, int mode);
void smw_mixer_init(sb_devc *devc);
void sb_dsp_midi_init (sb_devc *devc);
diff -urN linux-devel-virgin/drivers/sound/sb_common.c linux/drivers/sound/sb_common.c
--- linux-devel-virgin/drivers/sound/sb_common.c Sat Mar 18 02:23:30 2000
+++ linux/drivers/sound/sb_common.c Sat Mar 18 14:46:20 2000
@@ -908,13 +908,10 @@
}
if (!(devc->caps & SB_NO_AUDIO && devc->caps & SB_NO_MIDI))
{
- extern int sbmixnum;
-
if (devc->irq > 0)
free_irq(devc->irq, devc);

- sound_unload_mixerdev(devc->my_mixerdev);
- sbmixnum--;
+ sb_mixer_unload(devc);
/* We don't have to do this bit any more the UART401 is its own
master -- Krzysztof Halasa */
/* But we have to do it, if UART401 is not detected */
diff -urN linux-devel-virgin/drivers/sound/sb_mixer.c linux/drivers/sound/sb_mixer.c
--- linux-devel-virgin/drivers/sound/sb_mixer.c Mon Feb 28 07:18:20 2000
+++ linux/drivers/sound/sb_mixer.c Sat Mar 18 14:45:26 2000
@@ -740,3 +740,9 @@
sb_mixer_reset(devc);
return 1;
}
+
+void sb_mixer_unload(sb_devc *devc)
+{
+ sound_unload_mixerdev(devc->my_mixerdev);
+ sbmixnum--;
+}
\
 
 \ /
  Last update: 2005-03-22 13:57    [W:0.234 / U:0.036 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site