From 20de8e718ffcc83949c533a2ea1b037b98ded737 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Fri, 15 Oct 2010 14:34:13 -0700 Subject: [PATCH] --- yaml --- r: 211522 b: refs/heads/master c: e3c6cf61815b0af0c697aeed4c6f11762f913002 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/um/drivers/hostaudio_kern.c | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index b6e97f5a7f07..3b9272ea1f7c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a9febbb4bd1302b6f01aa1203b0a804e4e5c9e25 +refs/heads/master: e3c6cf61815b0af0c697aeed4c6f11762f913002 diff --git a/trunk/arch/um/drivers/hostaudio_kern.c b/trunk/arch/um/drivers/hostaudio_kern.c index 0c46e398cd8f..63c740a85b4c 100644 --- a/trunk/arch/um/drivers/hostaudio_kern.c +++ b/trunk/arch/um/drivers/hostaudio_kern.c @@ -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=\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 */