diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-10-20 04:21:33 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-10-20 04:21:33 -0400 |
| commit | 312f5726055534be1dc9dd369be13aabd2943fcb (patch) | |
| tree | 29394a3f83b4952a73b36a4aa962dfeda839e9db /lib/ts_fsm.c | |
| parent | 3d5efad953c6d5ba11d5bcb584ef8e906f953a73 (diff) | |
| parent | 93918e9afc76717176e9e114e79cdbb602a45ae8 (diff) | |
merge Linus head tree into my drm tree and fix up conflicts
Diffstat (limited to 'lib/ts_fsm.c')
| -rw-r--r-- | lib/ts_fsm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ts_fsm.c b/lib/ts_fsm.c index d27c0a072940..ca3211206eef 100644 --- a/lib/ts_fsm.c +++ b/lib/ts_fsm.c | |||
| @@ -258,7 +258,7 @@ found_match: | |||
| 258 | } | 258 | } |
| 259 | 259 | ||
| 260 | static struct ts_config *fsm_init(const void *pattern, unsigned int len, | 260 | static struct ts_config *fsm_init(const void *pattern, unsigned int len, |
| 261 | int gfp_mask) | 261 | gfp_t gfp_mask) |
| 262 | { | 262 | { |
| 263 | int i, err = -EINVAL; | 263 | int i, err = -EINVAL; |
| 264 | struct ts_config *conf; | 264 | struct ts_config *conf; |