aboutsummaryrefslogtreecommitdiff
path: root/net/irda/timer.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/irda/timer.c')
-rw-r--r--net/irda/timer.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/net/irda/timer.c b/net/irda/timer.c
index 0335ba0cc59..0c4c115a5ca 100644
--- a/net/irda/timer.c
+++ b/net/irda/timer.c
@@ -24,7 +24,6 @@
*
********************************************************************/
-#include <asm/system.h>
#include <linux/delay.h>
#include <net/irda/timer.h>
@@ -58,8 +57,8 @@ void irlap_start_query_timer(struct irlap_cb *self, int S, int s)
* Basically, we multiply the number of remaining slots by our
* slot time, plus add some extra time to properly receive the last
* discovery packet (which is longer due to extra discovery info),
- * to avoid messing with for incomming connections requests and
- * to accomodate devices that perform discovery slower than us.
+ * to avoid messing with for incoming connections requests and
+ * to accommodate devices that perform discovery slower than us.
* Jean II */
timeout = ((sysctl_slot_timeout * HZ / 1000) * (S - s)
+ XIDEXTRA_TIMEOUT + SMALLBUSY_TIMEOUT);