Skip to contentSkip to conversation

hostaudio fails to build as a module

PATCH In review Matt Zimmerman 2 participants 3 messages Dec 16, 2003 User-mode Linux (UML)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hostaudio fails to build as a module

DSP_HELP and MIXER_HELP are undefined when MODULE is defined. This patch just moves them out of the conditional.

Signature · 1 line
 - mdz
arch/um/drivers/hostaudio_kern.c renamed from arch/um/drivers/hostaudio_kern.c.orig +8 -8
@@ -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*/
#1 lore raw
Quoted 2 lines · Matt Zimmerman

DSP_HELP and MIXER_HELP are undefined when MODULE is defined. This patch just moves them out of the conditional.

I hadn't yet received the 2.4.22-7 release announcement when I sent this; looks like this change is already in there.

Signature · 12 lines
 - mdz


-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
_______________________________________________
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
#2 lore raw
Quoted 2 lines

I hadn't yet received the 2.4.22-7 release announcement when I sent this; looks like this change is already in there.

Yup, I fixed it pretty soon after I released -6.

Jeff

-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials. Become an expert in LINUX or just sharpen your skills. Sign up for IBM's Free Linux Tutorials. Learn everything from the bash shell to sys admin. Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
_______________________________________________
User-mode-linux-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel