From 7b50f581a7d5af70fb606b847cf0dc6043f29fc9 Mon Sep 17 00:00:00 2001 From: Paul Gortmaker Date: Tue, 30 Aug 2011 11:24:44 -0400 Subject: [PATCH] --- yaml --- r: 274371 b: refs/heads/master c: 639938eb606e94af498c589feae2f0b8a5c285d1 h: refs/heads/master i: 274369: 7c3d4df9dd3c83c01fcbfcf4c19381901ca806b0 274367: 7d5162ed2ce75238121a05f26c3ffca529adb0ea v: v3 --- [refs] | 2 +- trunk/include/linux/module.h | 5 ----- trunk/include/linux/moduleparam.h | 5 +++++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index d3eb5c82ac9a..5872c9ede055 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f50169324df4ad942e544386d136216c8617636a +refs/heads/master: 639938eb606e94af498c589feae2f0b8a5c285d1 diff --git a/trunk/include/linux/module.h b/trunk/include/linux/module.h index 9f0ddc808a82..3cb7839a60b9 100644 --- a/trunk/include/linux/module.h +++ b/trunk/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/trunk/include/linux/moduleparam.h b/trunk/include/linux/moduleparam.h index fffb10bd5514..7939f636c8ba 100644 --- a/trunk/include/linux/moduleparam.h +++ b/trunk/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 {