Merge tag 'nfs-for-3.5-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[~andy/linux] / include / linux / moduleparam.h

diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
index ea36486378d85577ece5b6bceada24ef242d422e..1b14d25162cb7cc56ff08960553ad89b32521ce7 100644 (file)
--- a/include/linux/moduleparam.h
+++ b/include/linux/moduleparam.h
@@ -320,7 +320,8 @@ extern int parse_args(const char *name,
                      unsigned num,
                      s16 level_min,
                      s16 level_max,
-                     int (*unknown)(char *param, char *val));
+                     int (*unknown)(char *param, char *val,
+                             const char *doing));
 
 /* Called by module remove. */
 #ifdef CONFIG_SYSFS