diff options
| author | Paul Moore <pmoore@redhat.com> | 2014-08-05 15:44:22 -0400 |
|---|---|---|
| committer | Paul Moore <pmoore@redhat.com> | 2014-08-05 15:44:22 -0400 |
| commit | aa9e0de81b5b257f6dae48efe2ed5f255f066497 (patch) | |
| tree | 9b0b791d5912368006115427e74105cfe26750bd /include/linux/moduleparam.h | |
| parent | 4fbe63d1c773cceef3fe1f6ed0c9c268f4f24760 (diff) | |
| parent | 19583ca584d6f574384e17fe7613dfaeadcdc4a6 (diff) | |
Merge tag 'v3.16' into next
Linux 3.16
Diffstat (limited to 'include/linux/moduleparam.h')
| -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 204a67743804..b1990c5524e1 100644 --- a/include/linux/moduleparam.h +++ b/include/linux/moduleparam.h | |||
| @@ -321,7 +321,7 @@ extern bool parameq(const char *name1, const char *name2); | |||
| 321 | extern bool parameqn(const char *name1, const char *name2, size_t n); | 321 | extern bool parameqn(const char *name1, const char *name2, size_t n); |
| 322 | 322 | ||
| 323 | /* Called on module insert or kernel boot */ | 323 | /* Called on module insert or kernel boot */ |
| 324 | extern int parse_args(const char *name, | 324 | extern char *parse_args(const char *name, |
| 325 | char *args, | 325 | char *args, |
| 326 | const struct kernel_param *params, | 326 | const struct kernel_param *params, |
| 327 | unsigned num, | 327 | unsigned num, |