Merge branch 'master'

[karo-tx-linux.git] / lib / ts_fsm.c

diff --git a/lib/ts_fsm.c b/lib/ts_fsm.c
index d27c0a072940457deb3681642c607ff043b1dc50..ef9779e005062d79de05f00cff7c0aa1ee3a24a3 100644 (file)
--- a/lib/ts_fsm.c
+++ b/lib/ts_fsm.c
@@ -258,7 +258,7 @@ found_match:
 }
 
 static struct ts_config *fsm_init(const void *pattern, unsigned int len,
-                                    int gfp_mask)
+                                    unsigned int __nocast gfp_mask)
 {
        int i, err = -EINVAL;
        struct ts_config *conf;