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

[linux-2.6-omap-h63xx.git] / lib / ts_bm.c

diff --git a/lib/ts_bm.c b/lib/ts_bm.c
index 1b61fceef77764c1c7e8ba2f4764358ea1cd4e58..8a8b3a16133ed643ccf572a0f33ceb80d1a9adc7 100644 (file)
--- a/lib/ts_bm.c
+++ b/lib/ts_bm.c
@@ -127,7 +127,7 @@ static void compute_prefix_tbl(struct ts_bm *bm, const u8 *pattern,
 }
 
 static struct ts_config *bm_init(const void *pattern, unsigned int len,
-                                unsigned int __nocast gfp_mask)
+                                gfp_t gfp_mask)
 {
        struct ts_config *conf;
        struct ts_bm *bm;