diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-24 01:32:42 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-24 01:32:42 -0400 |
| commit | 26e27cd424554202d36f38ee35421143788da127 (patch) | |
| tree | 04d068c76af5b636c061173465faa574d4b5e7b0 /include/net/irda/irlmp.h | |
| parent | b74ba22f030eb7ab88f7d8954ad18ecc0ac5ce3c (diff) | |
| parent | 387e2b0439026aa738a9edca15a57e5c0bcb4dfc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/net/irda/irlmp.h')
| -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 | ||