linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / s390 / net / fsm.c

diff --git a/drivers/s390/net/fsm.c b/drivers/s390/net/fsm.c
index fa09440..6caf5fa 100644 (file)
--- a/drivers/s390/net/fsm.c
+++ b/drivers/s390/net/fsm.c
@@ -1,6 +1,4 @@
 /**
- * $Id: fsm.c,v 1.6 2003/10/15 11:37:29 mschwide Exp $
- *
  * A generic FSM based on fsm used in isdn4linux
  *
  */
@@ -16,7 +14,7 @@ MODULE_LICENSE("GPL");
 
 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 nr_events, const fsm_node *tmpl, int tmpl_len, gfp_t order)
 {
        int i;
        fsm_instance *this;
@@ -78,8 +76,7 @@ kfree_fsm(fsm_instance *this)
 {
        if (this) {
                if (this->f) {
-                       if (this->f->jumpmatrix)
-                               kfree(this->f->jumpmatrix);
+                       kfree(this->f->jumpmatrix);
                        kfree(this->f);
                }
                kfree(this);