to get the miro aci interface (drivers/sound/lowlevel/aci.c) into the
sound.o module, I had to apply the following patch. It is a quite simple
one (only configuration stuff), but please check it before applying it to
the linux kernel (it is the first time for me to send a patch for the
kernel :-).
/Joerg
------
Joerg Diederich
e-mail: dieder@ibr.cs.tu-bs.de
-- cut here --
diff -u --recursive --new-file linux/drivers/sound/lowlevel.old/Makefile linux/drivers/sound/lowlevel/Makefile
--- linux/drivers/sound/lowlevel.old/Makefile Mon Jan 5 10:41:01 1998
+++ linux/drivers/sound/lowlevel/Makefile Sun Apr 19 23:14:27 1998
@@ -6,6 +6,10 @@
ifeq ($(CONFIG_LOWLEVEL_SOUND),y)
ifeq ($(CONFIG_ACI_MIXER),y)
OBJS := $(OBJS) aci.o
+else
+ ifeq ($(CONFIG_ACI_MIXER),m)
+ OBJS := $(OBJS) aci.o
+ endif
endif
ifeq ($(CONFIG_AWE32_SYNTH),y)
OBJS := $(OBJS) awe_wave.o
diff -u --recursive --new-file linux/drivers/sound/lowlevel.old/aci.c linux/drivers/sound/lowlevel/aci.c
--- linux/drivers/sound/lowlevel.old/aci.c Sat Feb 21 03:28:22 1998
+++ linux/drivers/sound/lowlevel/aci.c Wed May 13 20:54:04 1998
@@ -58,11 +58,10 @@
*
*/
-#include <linux/config.h> /* for CONFIG_ACI_MIXER */
#include "lowlevel.h"
#include "../sound_config.h"
#include "lowlevel.h"
-#ifdef CONFIG_ACI_MIXER
+#if defined(CONFIG_ACI_MIXER) || defined(CONFIG_ACI_MIXER_MODULE)
#undef DEBUG /* if defined, produce a verbose report via syslog */
@@ -76,6 +75,9 @@
#ifdef MODULE /* Whether the aci mixer is to be reset. */
int aci_reset = 0; /* Default: don't reset if the driver is a */
+
+MODULE_PARM(aci_reset,"i");
+
#else /* module; use "insmod sound.o aci_reset=1" */
int aci_reset = 1; /* to override. */
#endif
diff -u --recursive --new-file linux/drivers/sound/lowlevel.old/init.c linux/drivers/sound/lowlevel/init.c
--- linux/drivers/sound/lowlevel.old/init.c Sun Jan 4 19:40:16 1998
+++ linux/drivers/sound/lowlevel/init.c Wed May 13 20:53:34 1998
@@ -36,7 +36,7 @@
void
sound_init_lowlevel_drivers(void)
{
-#ifdef CONFIG_ACI_MIXER
+#if defined(CONFIG_ACI_MIXER) || defined(CONFIG_ACI_MIXER_MODULE)
attach_aci();
#endif
@@ -48,7 +48,7 @@
void
sound_unload_lowlevel_drivers(void)
{
-#ifdef CONFIG_ACI_MIXER
+#if defined(CONFIG_ACI_MIXER) || defined(CONFIG_ACI_MIXER_MODULE)
unload_aci();
#endif
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu