diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-22 13:15:08 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-22 13:15:08 +0000 |
| commit | c0d4367d6b581eb5989c02815880cf0fa2851ae8 (patch) | |
| tree | 868c266e627e2d7f65ba5a4d5f98a1c421453181 /modutils/modutils.h | |
| parent | f6bad5ef766b0447158e3de2f55c35f1f6cecb58 (diff) | |
| parent | da4441c44f6efccb6f7b7588404d9c6bfb7b6af8 (diff) | |
| download | busybox-w32-c0d4367d6b581eb5989c02815880cf0fa2851ae8.tar.gz busybox-w32-c0d4367d6b581eb5989c02815880cf0fa2851ae8.tar.bz2 busybox-w32-c0d4367d6b581eb5989c02815880cf0fa2851ae8.zip | |
Merge commit 'da4441c44f6efccb6f7b7588404d9c6bfb7b6af8' into merge
Conflicts:
libbb/vfork_daemon_rexec.c
networking/wget.c
procps/ps.c
Diffstat (limited to 'modutils/modutils.h')
| -rw-r--r-- | modutils/modutils.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modutils/modutils.h b/modutils/modutils.h index 863bc26d3..5f059c716 100644 --- a/modutils/modutils.h +++ b/modutils/modutils.h | |||
| @@ -21,7 +21,7 @@ void replace(char *s, char what, char with) FAST_FUNC; | |||
| 21 | char *replace_underscores(char *s) FAST_FUNC; | 21 | char *replace_underscores(char *s) FAST_FUNC; |
| 22 | int string_to_llist(char *string, llist_t **llist, const char *delim) FAST_FUNC; | 22 | int string_to_llist(char *string, llist_t **llist, const char *delim) FAST_FUNC; |
| 23 | char *filename2modname(const char *filename, char *modname) FAST_FUNC; | 23 | char *filename2modname(const char *filename, char *modname) FAST_FUNC; |
| 24 | char *parse_cmdline_module_options(char **argv) FAST_FUNC; | 24 | char *parse_cmdline_module_options(char **argv, int quote_spaces) FAST_FUNC; |
| 25 | 25 | ||
| 26 | /* insmod for 2.4 and modprobe's options (insmod 2.6 has no options at all): */ | 26 | /* insmod for 2.4 and modprobe's options (insmod 2.6 has no options at all): */ |
| 27 | #define INSMOD_OPTS \ | 27 | #define INSMOD_OPTS \ |