diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 21:07:59 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 21:07:59 -0400 |
| commit | 84c3d4aaec3338201b449034beac41635866bddf (patch) | |
| tree | 3412951682fb2dd4feb8a5532f8efbaf8b345933 /lib/textsearch.c | |
| parent | 43d2548bb2ef7e6d753f91468a746784041e522d (diff) | |
| parent | fafa3a3f16723997f039a0193997464d66dafd8f (diff) | |
Merge commit 'origin/master'
Manual merge of:
arch/powerpc/Kconfig
arch/powerpc/kernel/stacktrace.c
arch/powerpc/mm/slice.c
arch/ppc/kernel/smp.c
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 be8bda3862f5..a3e500ad51d7 100644 --- a/lib/textsearch.c +++ b/lib/textsearch.c | |||
| @@ -97,6 +97,7 @@ | |||
| 97 | #include <linux/types.h> | 97 | #include <linux/types.h> |
| 98 | #include <linux/string.h> | 98 | #include <linux/string.h> |
| 99 | #include <linux/init.h> | 99 | #include <linux/init.h> |
| 100 | #include <linux/rculist.h> | ||
| 100 | #include <linux/rcupdate.h> | 101 | #include <linux/rcupdate.h> |
| 101 | #include <linux/err.h> | 102 | #include <linux/err.h> |
| 102 | #include <linux/textsearch.h> | 103 | #include <linux/textsearch.h> |