diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:36 +0800 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:36 +0800 |
| commit | 591e5e125f9de0513a732371378eeffe09ef4da5 (patch) | |
| tree | d631e2313179ec61b484f1206e8f873b696ac41c /include | |
| parent | 6da6382191c30868dd8bf0624f6c2439339b7760 (diff) | |
| parent | 66e68aa37bceeb4279857b48d17023530aed4dbb (diff) | |
Merge topic branch 'ste-multimedia-framework' into integration-linux-ux500
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/moduleparam.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h index ea36486378d..3856fdba2c1 100644 --- a/include/linux/moduleparam.h +++ b/include/linux/moduleparam.h @@ -196,7 +196,7 @@ struct kparam_array /* We don't get oldget: it's often a new-style param_get_uint, etc. */ static inline int -__check_old_set_param(int (*oldset)(const char *, struct kernel_param *)) +__check_old_set_param(int (*oldset)(const char *, const struct kernel_param *)) { return 0; } |