Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

[firefly-linux-kernel-4.4.55.git] / include / linux / moduleparam.h

diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
index 204a677438049b13570e779f36078e0450298614..b1990c5524e1cea5a0d52f618f0846a1fd442dfe 100644 (file)
--- a/include/linux/moduleparam.h
+++ b/include/linux/moduleparam.h
@@ -321,7 +321,7 @@ extern bool parameq(const char *name1, const char *name2);
 extern bool parameqn(const char *name1, const char *name2, size_t n);
 
 /* Called on module insert or kernel boot */
-extern int parse_args(const char *name,
+extern char *parse_args(const char *name,
                      char *args,
                      const struct kernel_param *params,
                      unsigned num,