Merge branch 'from-linus' into upstream

[linux-drm-fsl-dcu.git] / lib / ts_fsm.c

diff --git a/lib/ts_fsm.c b/lib/ts_fsm.c
index d27c0a072940457deb3681642c607ff043b1dc50..87847c2ae9e28d9330c28df80dbef75ad99206b4 100644 (file)
--- a/lib/ts_fsm.c
+++ b/lib/ts_fsm.c
@@ -26,7 +26,6 @@
  *   however while in strict mode the average runtime can be better.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/string.h>
@@ -258,7 +257,7 @@ found_match:
 }
 
 static struct ts_config *fsm_init(const void *pattern, unsigned int len,
-                                    int gfp_mask)
+                                    gfp_t gfp_mask)
 {
        int i, err = -EINVAL;
        struct ts_config *conf;