diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 13:13:54 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 13:13:54 -0400 |
| commit | 11e4afb49b7fa1fc8e1ffd850c1806dd86a08204 (patch) | |
| tree | 9e57efcb106ae912f7bec718feb3f8ec607559bb /lib/textsearch.c | |
| parent | 162500b3a3ff39d941d29db49b41a16667ae44f0 (diff) | |
| parent | 9b2a606d3898fcb2eedb6faded3bb37549590ac4 (diff) | |
Merge branches 'gemini' and 'misc' into devel
Diffstat (limited to 'lib/textsearch.c')
| -rw-r--r-- | lib/textsearch.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/textsearch.c b/lib/textsearch.c index 9fbcb44c554f..d608331b3e47 100644 --- a/lib/textsearch.c +++ b/lib/textsearch.c | |||
| @@ -103,6 +103,7 @@ | |||
| 103 | #include <linux/rcupdate.h> | 103 | #include <linux/rcupdate.h> |
| 104 | #include <linux/err.h> | 104 | #include <linux/err.h> |
| 105 | #include <linux/textsearch.h> | 105 | #include <linux/textsearch.h> |
| 106 | #include <linux/slab.h> | ||
| 106 | 107 | ||
| 107 | static LIST_HEAD(ts_ops); | 108 | static LIST_HEAD(ts_ops); |
| 108 | static DEFINE_SPINLOCK(ts_mod_lock); | 109 | static DEFINE_SPINLOCK(ts_mod_lock); |