Merge /home/trondmy/scm/kernel/git/torvalds/linux-2.6

[linux-2.6] / include / linux / textsearch.h

diff --git a/include/linux/textsearch.h b/include/linux/textsearch.h
index 1a4990e448e9074a7c8a030b56c52271eff1221a..515046d1b2f42825efaef6959abf91893fcf0bb1 100644 (file)
--- a/include/linux/textsearch.h
+++ b/include/linux/textsearch.h
@@ -159,7 +159,7 @@ extern unsigned int textsearch_find_continuous(struct ts_config *,
 #define TS_PRIV_ALIGN(len) (((len) + TS_PRIV_ALIGNTO-1) & ~(TS_PRIV_ALIGNTO-1))
 
 static inline struct ts_config *alloc_ts_config(size_t payload,
-                                               unsigned int __nocast gfp_mask)
+                                               gfp_t gfp_mask)
 {
        struct ts_config *conf;