diff options
| author | Greg KH <greg@press.(none)> | 2005-10-28 10:13:16 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 10:13:16 -0700 |
| commit | 6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (patch) | |
| tree | c0414e89678fcef7ce3493e048d855bde781ae8d /drivers/s390/net/fsm.h | |
| parent | 1a222bca26ca691e83be1b08f5e96ae96d0d8cae (diff) | |
| parent | 27d1097d39509494706eaa2620ef3b1e780a3224 (diff) | |
| download | talos-obmc-linux-6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5.tar.gz talos-obmc-linux-6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5.zip | |
Merge ../bleed-2.6
Diffstat (limited to 'drivers/s390/net/fsm.h')
| -rw-r--r-- | drivers/s390/net/fsm.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 * init_fsm(char *name, const char **state_names, const char **event_names, int nr_states, int nr_events, const fsm_node *tmpl, - int tmpl_len, int order); + int tmpl_len, gfp_t order); /** * Releases an FSM |
