[2.1.77] patch to make 2.1.77 sound compile, and remove missing symbols I found.

• Messages sorted by: [ date ][ thread ][ subject ][ author ]
• Next message: Linus Torvalds: "Re: PROPOSAL: /proc/dev"
• Previous message: Linus Torvalds: "Re: 2.1.76, nfs client, and memory fragmentation"

Hi,
Here's a patch that you need to compile/use sound for 2.1.77. It might
be a good idea to include it it 2.1.78, unless I messed something up.
-Myrdraal

--PNTmBPCT7hxwcZjr
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="sound-2.1.77.diff"

diff -u --recursive linpatch/drivers/sound/sb_audio.c linux/drivers/sound/sb_audio.c
--- linpatch/drivers/sound/sb_audio.c Fri Jan 2 22:16:01 1998
+++ linux/drivers/sound/sb_audio.c Fri Jan 2 20:31:04 1998
@@ -982,7 +982,7 @@
sb_audio_close,
sb_set_output_parms,
sb_set_input_parms,
- sb_audio_ioctl,
+ NULL, /* ioctl */
sb1_audio_prepare_for_input,
sb1_audio_prepare_for_output,
sb1_audio_halt_xfer,
@@ -1002,7 +1002,7 @@
sb_audio_close,
sb_set_output_parms,
sb_set_input_parms,
- sb_audio_ioctl,
+ NULL, /* ioctl */
sb1_audio_prepare_for_input,
sb1_audio_prepare_for_output,
sb1_audio_halt_xfer,
@@ -1022,7 +1022,7 @@
sb_audio_close,
sb_set_output_parms,
sb_set_input_parms,
- sb_audio_ioctl,
+ NULL, /* ioctl */
sbpro_audio_prepare_for_input,
sbpro_audio_prepare_for_output,
sb1_audio_halt_xfer,
@@ -1042,7 +1042,7 @@
sb_audio_close,
sb_set_output_parms,
sb_set_input_parms,
- sb_audio_ioctl,
+ NULL, /* ioctl */
sbpro_audio_prepare_for_input,
sbpro_audio_prepare_for_output,
sb1_audio_halt_xfer,
@@ -1062,7 +1062,7 @@
sb_audio_close,
sb_set_output_parms,
sb_set_input_parms,
- sb_audio_ioctl,
+ NULL, /* ioctl */
sb16_audio_prepare_for_input,
sb16_audio_prepare_for_output,
sb1_audio_halt_xfer,
@@ -1082,7 +1082,7 @@
sb_audio_close,
sb_set_output_parms,
sb_set_input_parms,
- sb_audio_ioctl,
+ NULL, /* ioctl */
ess_audio_prepare_for_input,
ess_audio_prepare_for_output,
sb1_audio_halt_xfer,
diff -u --recursive linpatch/drivers/sound/sound_calls.h linux/drivers/sound/sound_calls.h
--- linpatch/drivers/sound/sound_calls.h Fri Jan 2 22:16:01 1998
+++ linux/drivers/sound/sound_calls.h Fri Jan 2 21:24:34 1998
@@ -184,6 +184,7 @@
/* From sound_timer.c */
void sound_timer_interrupt(void);
void sound_timer_syncinterval(unsigned int new_usecs);
+void reprogram_timer(void);

/* From ad1848.c */
int ad1848_init (char *name, int io_base, int irq, int dma_playback, int dma_capture, int share_dma, int *osp);
diff -u --recursive linpatch/drivers/sound/sound_syms.c linux/drivers/sound/sound_syms.c
--- linpatch/drivers/sound/sound_syms.c Fri Jan 2 22:16:01 1998
+++ linux/drivers/sound/sound_syms.c Fri Jan 2 21:22:55 1998
@@ -62,6 +62,7 @@
EXPORT_SYMBOL(sound_timer_init);
EXPORT_SYMBOL(sound_timer_interrupt);
EXPORT_SYMBOL(sound_timer_syncinterval);
+EXPORT_SYMBOL(reprogram_timer);

/* Locking */
EXPORT_SYMBOL(sound_locker);
diff -u --recursive linpatch/drivers/sound/sound_timer.c linux/drivers/sound/sound_timer.c
--- linpatch/drivers/sound/sound_timer.c Fri Jan 2 22:16:01 1998
+++ linux/drivers/sound/sound_timer.c Fri Jan 2 21:33:01 1998
@@ -46,7 +46,7 @@
return (tmp + (scale / 2)) / scale;
}

-static void
+void
reprogram_timer(void)
{
unsigned long usecs_per_tick;

--PNTmBPCT7hxwcZjr--

• Next message: Linus Torvalds: "Re: PROPOSAL: /proc/dev"
• Previous message: Linus Torvalds: "Re: 2.1.76, nfs client, and memory fragmentation"