summaryrefslogtreecommitdiffstats
path: root/drivers/s390/net/fsm.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-28 12:30:29 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-10-28 12:30:29 -0400
commit35ebbae2836a361330b784706b7140c90a346a53 (patch)
treeada3c046a8b6bfdf21bcb0932b4b65c95c2af073 /drivers/s390/net/fsm.h
parentc6a33e2464edd87f8c12cc2d11369a5b44c65b77 (diff)
parent5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (diff)
downloadtalos-obmc-linux-35ebbae2836a361330b784706b7140c90a346a53.tar.gz
talos-obmc-linux-35ebbae2836a361330b784706b7140c90a346a53.zip
Merge branch 'master'
Diffstat (limited to 'drivers/s390/net/fsm.h')
-rw-r--r--drivers/s390/net/fsm.h2
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
OpenPOWER on IntegriCloud