diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-05-26 16:06:58 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-05-26 16:06:58 -0400 |
| commit | f587fb74b26a10354f1eb73e8d054cd15e5a2fe2 (patch) | |
| tree | a453a270fc86ada85d808487c911387739ce2296 /include/net | |
| parent | df8ccb9bf1ca360581a94c2245efb9fa613fbb29 (diff) | |
| parent | 705af309505681f197f81618440954d10f120dc0 (diff) | |
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 { | |||
| 112 | 112 | ||
| 113 | struct timer_list watchdog_timer; | 113 | struct timer_list watchdog_timer; |
| 114 | 114 | ||
| 115 | IRLMP_STATE lsap_state; /* Connection state */ | 115 | LSAP_STATE lsap_state; /* Connection state */ |
| 116 | notify_t notify; /* Indication/Confirm entry points */ | 116 | notify_t notify; /* Indication/Confirm entry points */ |
| 117 | struct qos_info qos; /* QoS for this connection */ | 117 | struct qos_info qos; /* QoS for this connection */ |
| 118 | 118 | ||