diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-23 00:22:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-23 00:22:41 -0700 |
| commit | 359f482533ebf0c974eabbcc83df63b841998eb2 (patch) | |
| tree | ae93a243d19f93db7e71acfffe902cd5c50d9136 /include/linux/moduleparam.h | |
| parent | 9c46b04a4e3ecec0e96a188c5e68c10c8dd769d3 (diff) | |
| parent | f6297acf85a1c6bfd02ad772e719b8827c9bbd33 (diff) | |
Merge bk://kernel.bkbits.net/gregkh/linux/pci-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Manual merge of kernel/params.c clashes.
Diffstat (limited to 'include/linux/moduleparam.h')
| -rw-r--r-- | include/linux/moduleparam.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h index 3b961421c359..7a145cd86c40 100644 --- a/include/linux/moduleparam.h +++ b/include/linux/moduleparam.h @@ -73,7 +73,7 @@ struct kparam_array #define module_param_string(name, string, len, perm) \ static struct kparam_string __param_string_##name \ = { len, string }; \ - module_param_call(name, param_set_copystring, param_get_charp, \ + module_param_call(name, param_set_copystring, param_get_string, \ &__param_string_##name, perm) /* Called on module insert or kernel boot */ @@ -144,6 +144,7 @@ extern int param_array_set(const char *val, struct kernel_param *kp); extern int param_array_get(char *buffer, struct kernel_param *kp); extern int param_set_copystring(const char *val, struct kernel_param *kp); +extern int param_get_string(char *buffer, struct kernel_param *kp); int param_array(const char *name, const char *val, |