diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-14 06:19:59 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-14 06:19:59 -0400 |
| commit | 8d7ccaa545490cdffdfaff0842436a8dd85cf47b (patch) | |
| tree | 8129b5907161bc6ae26deb3645ce1e280c5e1f51 /lib/textsearch.c | |
| parent | b2139aa0eec330c711c5a279db361e5ef1178e78 (diff) | |
| parent | 30a2f3c60a84092c8084dfe788b710f8d0768cd4 (diff) | |
Merge commit 'v2.6.27-rc3' into x86/prototypes
Conflicts:
include/asm-x86/dma-mapping.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 4b7c6075256f..9fbcb44c554f 100644 --- a/lib/textsearch.c +++ b/lib/textsearch.c | |||
| @@ -267,7 +267,7 @@ struct ts_config *textsearch_prepare(const char *algo, const void *pattern, | |||
| 267 | return ERR_PTR(-EINVAL); | 267 | return ERR_PTR(-EINVAL); |
| 268 | 268 | ||
| 269 | ops = lookup_ts_algo(algo); | 269 | ops = lookup_ts_algo(algo); |
| 270 | #ifdef CONFIG_KMOD | 270 | #ifdef CONFIG_MODULES |
| 271 | /* | 271 | /* |
| 272 | * Why not always autoload you may ask. Some users are | 272 | * Why not always autoload you may ask. Some users are |
| 273 | * in a situation where requesting a module may deadlock, | 273 | * in a situation where requesting a module may deadlock, |