Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3c6cf61 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Linus Torvalds
Browse files

uml: fix build 



Fix a build error introduced by d6d1b650 ("param: simple
locking for sysfs-writable charp parameters").

    CC      arch/um/kernel/trap.o
  arch/um/drivers/hostaudio_kern.c: In function 'hostaudio_open':
  arch/um/drivers/hostaudio_kern.c:204: error: '__param_dsp' undeclared (first use in this function)
  arch/um/drivers/hostaudio_kern.c:204: error: (Each undeclared identifier is reported only once
  arch/um/drivers/hostaudio_kern.c:204: error: for each function it appears in.)
  arch/um/drivers/hostaudio_kern.c: In function 'hostmixer_open_mixdev':
  arch/um/drivers/hostaudio_kern.c:265: error: '__param_mixer' undeclared (first use in this function)
  arch/um/drivers/hostaudio_kern.c:272: error: '__param_dsp' undeclared (first use in this function)

Reported-by: default avatarToralf Förster <toralf.foerster@gmx.de>
Tested-by: default avatarToralf Förster <toralf.foerster@gmx.de>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Takashi Iwai <tiwai@suse.de>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a9febbb4

arch/um/drivers/hostaudio_kern.c

+5 −9
Original line number Diff line number Diff line
@@ -40,6 +40,11 @@ static char *mixer = HOSTAUDIO_DEV_MIXER; 
"    This is used to specify the host mixer device to the hostaudio driver.\n"\

"    The default is \"" HOSTAUDIO_DEV_MIXER "\".\n\n"



module_param(dsp, charp, 0644);

MODULE_PARM_DESC(dsp, DSP_HELP);

module_param(mixer, charp, 0644);

MODULE_PARM_DESC(mixer, MIXER_HELP);



#ifndef MODULE

static int set_dsp(char *name, int *add)

{
@@ -56,15 +61,6 @@ static int set_mixer(char *name, int *add) 
}



__uml_setup("mixer=", set_mixer, "mixer=<mixer device>\n" MIXER_HELP);



#else /*MODULE*/



module_param(dsp, charp, 0644);

MODULE_PARM_DESC(dsp, DSP_HELP);



module_param(mixer, charp, 0644);

MODULE_PARM_DESC(mixer, MIXER_HELP);



#endif



/* /dev/dsp file operations */