diff options
| author | Kyle McMartin <kyle@parisc-linux.org> | 2005-10-28 12:18:07 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@parisc-linux.org> | 2005-10-28 12:18:07 -0400 |
| commit | 210cc679faf0e1cabda9fc5d1279644f5e52aecb (patch) | |
| tree | f0816c90ae937a159f8bfec6018a6271223b954a /drivers/s390 | |
| parent | e0f998930eb67c49f2862c58a45262ad0bc03eca (diff) | |
| parent | 260b23674fdb570f3235ce55892246bef1c24c2a (diff) | |
Auto-update from upstream
Diffstat (limited to 'drivers/s390')
| -rw-r--r-- | drivers/s390/net/fsm.c | 2 | ||||
| -rw-r--r-- | drivers/s390/net/fsm.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/net/fsm.c b/drivers/s390/net/fsm.c index fa09440d82e5..38f50b7129a2 100644 --- a/drivers/s390/net/fsm.c +++ b/drivers/s390/net/fsm.c | |||
| @@ -16,7 +16,7 @@ MODULE_LICENSE("GPL"); | |||
| 16 | 16 | ||
| 17 | fsm_instance * | 17 | fsm_instance * |
| 18 | init_fsm(char *name, const char **state_names, const char **event_names, int nr_states, | 18 | init_fsm(char *name, const char **state_names, const char **event_names, int nr_states, |
| 19 | int nr_events, const fsm_node *tmpl, int tmpl_len, int order) | 19 | int nr_events, const fsm_node *tmpl, int tmpl_len, gfp_t order) |
| 20 | { | 20 | { |
| 21 | int i; | 21 | int i; |
| 22 | fsm_instance *this; | 22 | fsm_instance *this; |
diff --git a/drivers/s390/net/fsm.h b/drivers/s390/net/fsm.h index f9a011001eb6..1b8a7e7c34f3 100644 --- a/drivers/s390/net/fsm.h +++ b/drivers/s390/net/fsm.h | |||
| @@ -110,7 +110,7 @@ extern fsm_instance * | |||
| 110 | init_fsm(char *name, const char **state_names, | 110 | init_fsm(char *name, const char **state_names, |
| 111 | const char **event_names, | 111 | const char **event_names, |
| 112 | int nr_states, int nr_events, const fsm_node *tmpl, | 112 | int nr_states, int nr_events, const fsm_node *tmpl, |
| 113 | int tmpl_len, int order); | 113 | int tmpl_len, gfp_t order); |
| 114 | 114 | ||
| 115 | /** | 115 | /** |
| 116 | * Releases an FSM | 116 | * Releases an FSM |