[uml-devel] Slight host audio problem in 2.4.22-6

[James W McMechan <mcmechanjw@juno.com>]

[-- Attachment #1: Type: text/plain, Size: 448 bytes --]

While compiling my standard options I got

hostaudio_kern.c:51: parse error before "DSP_HELP"
hostaudio_kern.c:54: parse error before "MIXER_HELP"
make[1]: *** [hostaudio_kern.o] Error 1
make[1]: Leaving directory `/home/uml/work-2.4.22-6/arch/um/drivers'

The new help defines were only in the non module part of the #ifndef
attached patch to move it before the whole #ifndef so it should work
both as a module and built-in

Enjoy,

James McMechan

[-- Attachment #2: host_audio --]
[-- Type: application/octet-stream, Size: 1332 bytes --]

diff -Nur uml-2.4.22-6/arch/um/drivers/hostaudio_kern.c work-2.4.22-6/arch/um/drivers/hostaudio_kern.c
--- uml-2.4.22-6/arch/um/drivers/hostaudio_kern.c	2003-11-11 06:51:06.000000000 -0800
+++ work-2.4.22-6/arch/um/drivers/hostaudio_kern.c	2003-11-11 08:31:25.000000000 -0800
@@ -20,6 +20,14 @@
 char *dsp = HOSTAUDIO_DEV_DSP;
 char *mixer = HOSTAUDIO_DEV_MIXER;
 
+#define DSP_HELP \
+"    This is used to specify the host dsp device to the hostaudio driver.\n" \
+"    The default is \"" HOSTAUDIO_DEV_DSP "\".\n\n"
+
+#define MIXER_HELP \
+"    This is used to specify the host mixer device to the hostaudio driver.\n" \
+"    The default is \"" HOSTAUDIO_DEV_MIXER "\".\n\n"
+
 #ifndef MODULE
 static int set_dsp(char *name, int *add)
 {
@@ -27,10 +35,6 @@
 	return(0);
 }
 
-#define DSP_HELP \
-"    This is used to specify the host dsp device to the hostaudio driver.\n" \
-"    The default is \"" HOSTAUDIO_DEV_DSP "\".\n\n"
-
 __uml_setup("dsp=", set_dsp, "dsp=<dsp device>\n" DSP_HELP);
 
 static int set_mixer(char *name, int *add)
@@ -39,10 +43,6 @@
 	return(0);
 }
 
-#define MIXER_HELP \
-"    This is used to specify the host mixer device to the hostaudio driver.\n" \
-"    The default is \"" HOSTAUDIO_DEV_MIXER "\".\n\n"
-
 __uml_setup("mixer=", set_mixer, "mixer=<mixer device>\n" MIXER_HELP);
 
 #else /*MODULE*/