diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-18 05:39:39 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-18 05:39:39 -0400 |
| commit | 49997d75152b3d23c53b0fa730599f2f74c92c65 (patch) | |
| tree | 46e93126170d02cfec9505172e545732c1b69656 /lib/textsearch.c | |
| parent | a0c80b80e0fb48129e4e9d6a9ede914f9ff1850d (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/powerpc/booting-without-of.txt
drivers/atm/Makefile
drivers/net/fs_enet/fs_enet-main.c
drivers/pci/pci-acpi.c
net/8021q/vlan.c
net/iucv/iucv.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 b451fcc9354c..4b7c6075256f 100644 --- a/lib/textsearch.c +++ b/lib/textsearch.c | |||
| @@ -99,6 +99,7 @@ | |||
| 99 | #include <linux/types.h> | 99 | #include <linux/types.h> |
| 100 | #include <linux/string.h> | 100 | #include <linux/string.h> |
| 101 | #include <linux/init.h> | 101 | #include <linux/init.h> |
| 102 | #include <linux/rculist.h> | ||
| 102 | #include <linux/rcupdate.h> | 103 | #include <linux/rcupdate.h> |
| 103 | #include <linux/err.h> | 104 | #include <linux/err.h> |
| 104 | #include <linux/textsearch.h> | 105 | #include <linux/textsearch.h> |