diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-06-30 00:21:34 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-06-30 00:21:34 +0000 |
| commit | 3917ac5846dd0f9ad1238166f90caab9912052e6 (patch) | |
| tree | 1c298935def4f29edb39192365a65d73de999155 /drivers/sound | |
| parent | af2f803c8b2d469fe38e4a7ce952658dfcb6681a (diff) | |
o Merge with Linux 2.1.100.
o Cleanup the machine dependencies of floppy and rtc. The driver for
the Dallas thingy in the Indy is still missing.
o Handle allocation of zero'd pages correct for R4000SC / R4400SC.
o Page colouring shit to match the virtual and physical colour of all
mapped pages. This tends to produce extreme fragmentation problems,
so it's deactivated for now. Users of R4000SC / R4400SC may re-enable
the code in arch/mips/mm/init.c by removing the definition of
CONF_GIVE_A_SHIT_ABOUT_COLOURS. Should get them somewhat further -
but don't shake to hard ...
o Fixed ptrace(2)-ing of syscalls, strace is now working again.
o Fix the interrupt forwarding from the keyboard driver to the psaux
driver, PS/2 mice are now working on the Indy. The fix is somewhat
broken as it prevents generic kernels for Indy and machines which handle
things different.
o Things I can't remember.
Diffstat (limited to 'drivers/sound')
| -rw-r--r-- | drivers/sound/Makefile | 3 | ||||
| -rw-r--r-- | drivers/sound/sound_syms.c | 2 | ||||
| -rw-r--r-- | drivers/sound/sscape.c | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/drivers/sound/Makefile b/drivers/sound/Makefile index 1f71965f2..4cfb171dc 100644 --- a/drivers/sound/Makefile +++ b/drivers/sound/Makefile @@ -76,6 +76,9 @@ endif ifeq ($(CONFIG_GUS),y) L_OBJS += gus.o + ifeq ($(CONFIG_GUSMAX),y) + CONFIG_MSS = y + endif else ifeq ($(CONFIG_GUS),m) M_OBJS += gus.o diff --git a/drivers/sound/sound_syms.c b/drivers/sound/sound_syms.c index 2758660d5..dd06d250a 100644 --- a/drivers/sound/sound_syms.c +++ b/drivers/sound/sound_syms.c @@ -26,6 +26,7 @@ EXPORT_SYMBOL(num_audiodevs); EXPORT_SYMBOL(note_to_freq); EXPORT_SYMBOL(compute_finetune); EXPORT_SYMBOL(seq_copy_to_input); +EXPORT_SYMBOL(seq_input_event); EXPORT_SYMBOL(sequencer_init); EXPORT_SYMBOL(sequencer_timer); @@ -61,6 +62,7 @@ EXPORT_SYMBOL(conf_printf2); EXPORT_SYMBOL(sound_timer_init); EXPORT_SYMBOL(sound_timer_interrupt); EXPORT_SYMBOL(sound_timer_syncinterval); +EXPORT_SYMBOL(sound_timer_devs); /* Locking */ EXPORT_SYMBOL(sound_locker); diff --git a/drivers/sound/sscape.c b/drivers/sound/sscape.c index 8ea3e87f8..2da737c5c 100644 --- a/drivers/sound/sscape.c +++ b/drivers/sound/sscape.c @@ -970,7 +970,7 @@ void cleanup_module(void) if (mss) unload_ss_ms_sound(&config); SOUND_LOCK_END; - unload_sscape(&config); + unload_sscape(&mpu_config); } #endif |