From 3917ac5846dd0f9ad1238166f90caab9912052e6 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Tue, 30 Jun 1998 00:21:34 +0000 Subject: 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. --- drivers/sound/Makefile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'drivers/sound/Makefile') 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 -- cgit v1.2.3