diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-08-30 11:24:44 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-10-31 09:20:11 -0400 |
| commit | 639938eb606e94af498c589feae2f0b8a5c285d1 (patch) | |
| tree | 30c9025fa85ab7d9db09bd84109e2036218a8157 | |
| parent | f50169324df4ad942e544386d136216c8617636a (diff) | |
| download | kernel-common-639938eb606e94af498c589feae2f0b8a5c285d1.tar.gz kernel-common-639938eb606e94af498c589feae2f0b8a5c285d1.tar.bz2 kernel-common-639938eb606e94af498c589feae2f0b8a5c285d1.zip | |
module.h: relocate MODULE_PARM_DESC into moduleparam.h
There are files which use module_param and MODULE_PARM_DESC
back to back. They only include moduleparam.h which makes sense,
but the implicit presence of module.h everywhere hid the fact
that MODULE_PARM_DESC wasn't in moduleparam.h at all. Relocate
the macro to moduleparam.h so that the moduleparam infrastructure
can be used independently of module.h
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | include/linux/module.h | 5 | ||||
| -rw-r--r-- | include/linux/moduleparam.h | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index 9f0ddc808a82..3cb7839a60b9 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -135,11 +135,6 @@ extern const struct gtype##_id __mod_##gtype##_table \ /* What your module does. */ #define MODULE_DESCRIPTION(_description) MODULE_INFO(description, _description) -/* One for each parameter, describing how to use it. Some files do - multiple of these per line, so can't just use MODULE_INFO. */ -#define MODULE_PARM_DESC(_parm, desc) \ - __MODULE_INFO(parm, _parm, #_parm ":" desc) - #define MODULE_DEVICE_TABLE(type,name) \ MODULE_GENERIC_TABLE(type##_device,name) diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h index fffb10bd5514..7939f636c8ba 100644 --- a/include/linux/moduleparam.h +++ b/include/linux/moduleparam.h @@ -31,6 +31,11 @@ static const char __module_cat(name,__LINE__)[] \ #define __MODULE_PARM_TYPE(name, _type) \ __MODULE_INFO(parmtype, name##type, #name ":" _type) +/* One for each parameter, describing how to use it. Some files do + multiple of these per line, so can't just use MODULE_INFO. */ +#define MODULE_PARM_DESC(_parm, desc) \ + __MODULE_INFO(parm, _parm, #_parm ":" desc) + struct kernel_param; struct kernel_param_ops { |