diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:29:23 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:29:23 -0400 |
| commit | 7a9f8f93d2dad38f30fbc79d8a1e6517373aa4b6 (patch) | |
| tree | 9116e5bde860d00685c5b6eee7be5ba9899aabb9 /lib/textsearch.c | |
| parent | 972c26bdd6b58e7534473c4f7928584578cf43f4 (diff) | |
| parent | 5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (diff) | |
Merge branch 'master'
Diffstat (limited to 'lib/textsearch.c')
| -rw-r--r-- | lib/textsearch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/textsearch.c b/lib/textsearch.c index 1e934c196f0f..6f3093efbd7b 100644 --- a/lib/textsearch.c +++ b/lib/textsearch.c | |||
| @@ -254,7 +254,7 @@ unsigned int textsearch_find_continuous(struct ts_config *conf, | |||
| 254 | * parameters or a ERR_PTR(). | 254 | * parameters or a ERR_PTR(). |
| 255 | */ | 255 | */ |
| 256 | struct ts_config *textsearch_prepare(const char *algo, const void *pattern, | 256 | struct ts_config *textsearch_prepare(const char *algo, const void *pattern, |
| 257 | unsigned int len, int gfp_mask, int flags) | 257 | unsigned int len, gfp_t gfp_mask, int flags) |
| 258 | { | 258 | { |
| 259 | int err = -ENOENT; | 259 | int err = -ENOENT; |
| 260 | struct ts_config *conf; | 260 | struct ts_config *conf; |