Merge branch 'master'

1 files changed, 0 insertions, 7 deletions

diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
index b5c98c4377..7c0c2c198f 100644
--- a/include/linux/moduleparam.h
+++ b/include/linux/moduleparam.h
@@ -162,13 +162,6 @@ 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,
-                unsigned int min, unsigned int max,
-                void *elem, int elemsize,
-                int (*set)(const char *, struct kernel_param *kp),
-                int *num);
-
 /* for exporting parameters in /sys/parameters */
 
 struct module;