diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-24 04:22:21 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-24 04:22:21 -0400 |
| commit | 66643de455c27973ac31ad6de9f859d399916842 (patch) | |
| tree | 7ebed7f051879007d4b11d6aaa9e65a1bcb0b08f /include/net/irda | |
| parent | 2c23d62abb820e19c54012520f08a198c2233a85 (diff) | |
| parent | 387e2b0439026aa738a9edca15a57e5c0bcb4dfc (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-powerpc/unistd.h
include/asm-sparc/unistd.h
include/asm-sparc64/unistd.h
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/net/irda')
| -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 0d8e9fa416f3..11ecfa58a648 100644 --- a/include/net/irda/irlmp.h +++ b/include/net/irda/irlmp.h | |||
| @@ -111,7 +111,7 @@ struct lsap_cb { | |||
| 111 | 111 | ||
| 112 | struct timer_list watchdog_timer; | 112 | struct timer_list watchdog_timer; |
| 113 | 113 | ||
| 114 | IRLMP_STATE lsap_state; /* Connection state */ | 114 | LSAP_STATE lsap_state; /* Connection state */ |
| 115 | notify_t notify; /* Indication/Confirm entry points */ | 115 | notify_t notify; /* Indication/Confirm entry points */ |
| 116 | struct qos_info qos; /* QoS for this connection */ | 116 | struct qos_info qos; /* QoS for this connection */ |
| 117 | 117 | ||