diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-05-10 05:59:37 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-05-10 08:20:42 -0400 |
| commit | dbb6be6d5e974c42bbecd183effaa0df69e1dd8b (patch) | |
| tree | 5735cb47e70853d057a9881dd0ce44b83e88fa63 /lib/textsearch.c | |
| parent | 6a867a395558a7f882d041783e4cdea6744ca2bf (diff) | |
| parent | b57f95a38233a2e73b679bea4a5453a1cc2a1cc9 (diff) | |
Merge branch 'linus' into timers/core
Reason: Further posix_cpu_timer patches depend on mainline changes
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
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); |