diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-05-26 22:06:58 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-05-26 22:06:58 +0200 |
| commit | f587fb74b26a10354f1eb73e8d054cd15e5a2fe2 (patch) | |
| tree | a453a270fc86ada85d808487c911387739ce2296 /include/net | |
| parent | [PATCH] hostap: new pcmcia IDs (diff) | |
| parent | [PATCH] s390: fix typo in stop_hz_timer. (diff) | |
| download | linux-f587fb74b26a10354f1eb73e8d054cd15e5a2fe2.tar.xz linux-f587fb74b26a10354f1eb73e8d054cd15e5a2fe2.zip | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/irda/irlmp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/irda/irlmp.h b/include/net/irda/irlmp.h index 86aefb1fda5e..c0c895d379ba 100644 --- a/include/net/irda/irlmp.h +++ b/include/net/irda/irlmp.h @@ -112,7 +112,7 @@ struct lsap_cb { struct timer_list watchdog_timer; - IRLMP_STATE lsap_state; /* Connection state */ + LSAP_STATE lsap_state; /* Connection state */ notify_t notify; /* Indication/Confirm entry points */ struct qos_info qos; /* QoS for this connection */ |