summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/dev/cardbus/cardbus.c4
-rw-r--r--sys/dev/cardbus/cardslot.c8
-rw-r--r--sys/dev/cardbus/if_rl_cardbus.c4
-rw-r--r--sys/dev/cardbus/if_xl_cardbus.c4
-rw-r--r--sys/dev/cardbus/rbus.c6
5 files changed, 13 insertions, 13 deletions
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c
index 601a420b5f8..7bca20c2955 100644
--- a/sys/dev/cardbus/cardbus.c
+++ b/sys/dev/cardbus/cardbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cardbus.c,v 1.7 2003/04/27 11:22:52 ho Exp $ */
+/* $OpenBSD: cardbus.c,v 1.8 2003/10/21 10:07:33 jmc Exp $ */
/* $NetBSD: cardbus.c,v 1.24 2000/04/02 19:11:37 mycroft Exp $ */
/*
@@ -372,7 +372,7 @@ parse_tuple(u_int8_t *tuple, int len, void *data)
* int cardbus_attach_card(struct cardbus_softc *sc)
*
* This function attaches the card on the slot: turns on power,
- * reads and analyses tuple, sets consifuration index.
+ * reads and analyses tuple, sets configuration index.
*
* This function returns the number of recognised device functions.
* If no functions are recognised, return 0.
diff --git a/sys/dev/cardbus/cardslot.c b/sys/dev/cardbus/cardslot.c
index 7201758ac9e..b315e63f602 100644
--- a/sys/dev/cardbus/cardslot.c
+++ b/sys/dev/cardbus/cardslot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cardslot.c,v 1.2 2002/03/14 01:26:53 millert Exp $ */
+/* $OpenBSD: cardslot.c,v 1.3 2003/10/21 10:07:33 jmc Exp $ */
/* $NetBSD: cardslot.c,v 1.9 2000/03/22 09:35:06 haya Exp $ */
/*
@@ -161,7 +161,7 @@ cardslotattach(parent, self, aux)
}
CARDSLOT_SET_CARDTYPE(sc->sc_status, CARDSLOT_STATUS_CARD_CB);
} else {
- /* attach deffered */
+ /* attach deferred */
cardslot_event_throw(sc, CARDSLOT_EVENT_INSERTION_CB);
}
}
@@ -173,7 +173,7 @@ cardslotattach(parent, self, aux)
pcmcia_card_attach((struct device *)sc->sc_16_softc);
CARDSLOT_SET_CARDTYPE(sc->sc_status, CARDSLOT_STATUS_CARD_16);
} else {
- /* attach deffered */
+ /* attach deferred */
cardslot_event_throw(sc, CARDSLOT_EVENT_INSERTION_16);
}
}
@@ -318,7 +318,7 @@ cardslot_event_thread(arg)
splx(s);
if (IS_CARDSLOT_INSERT_REMOVE_EV(ce->ce_type)) {
- /* Chattering supression */
+ /* Chattering suppression */
s = spltty();
while (1) {
struct cardslot_event *ce1, *ce2;
diff --git a/sys/dev/cardbus/if_rl_cardbus.c b/sys/dev/cardbus/if_rl_cardbus.c
index 9aab1b2f316..147d9ede492 100644
--- a/sys/dev/cardbus/if_rl_cardbus.c
+++ b/sys/dev/cardbus/if_rl_cardbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_rl_cardbus.c,v 1.4 2003/09/27 19:40:23 fgsch Exp $ */
+/* $OpenBSD: if_rl_cardbus.c,v 1.5 2003/10/21 10:07:33 jmc Exp $ */
/* $NetBSD: if_rl_cardbus.c,v 1.3.8.3 2001/11/14 19:14:02 nathanw Exp $ */
/*
@@ -262,7 +262,7 @@ rl_cardbus_detach(self, flags)
if (rv)
return (rv);
/*
- * Unhook the interrut handler.
+ * Unhook the interrupt handler.
*/
if (csc->sc_ih != NULL)
cardbus_intr_disestablish(ct->ct_cc, ct->ct_cf, csc->sc_ih);
diff --git a/sys/dev/cardbus/if_xl_cardbus.c b/sys/dev/cardbus/if_xl_cardbus.c
index 5b2fae38583..ccf003a1671 100644
--- a/sys/dev/cardbus/if_xl_cardbus.c
+++ b/sys/dev/cardbus/if_xl_cardbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_xl_cardbus.c,v 1.12 2002/10/12 01:09:44 krw Exp $ */
+/* $OpenBSD: if_xl_cardbus.c,v 1.13 2003/10/21 10:07:33 jmc Exp $ */
/* $NetBSD: if_xl_cardbus.c,v 1.13 2000/03/07 00:32:52 mycroft Exp $ */
/*
@@ -275,7 +275,7 @@ xl_cardbus_attach(parent, self, aux)
command);
/*
- * set latency timmer
+ * set latency timer
*/
bhlc = cardbus_conf_read(cc, cf, ca->ca_tag, CARDBUS_BHLC_REG);
if (CARDBUS_LATTIMER(bhlc) < 0x20) {
diff --git a/sys/dev/cardbus/rbus.c b/sys/dev/cardbus/rbus.c
index 7e2c0437c1a..7c92b9099e2 100644
--- a/sys/dev/cardbus/rbus.c
+++ b/sys/dev/cardbus/rbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rbus.c,v 1.6 2003/06/26 00:58:38 mickey Exp $ */
+/* $OpenBSD: rbus.c,v 1.7 2003/10/21 10:07:33 jmc Exp $ */
/* $NetBSD: rbus.c,v 1.3 1999/11/06 06:20:53 soren Exp $ */
/*
* Copyright (c) 1999
@@ -235,7 +235,7 @@ rbus_new_body(bt, parent, ex, start, end, offset, flags)
/* sanity check */
if (parent != NULL) {
if (start < parent->rb_start || end > parent->rb_end) {
- /* out of range: [start, size] should be containd in parent space */
+ /* out of range: [start, size] should be contained in parent space */
return 0;
/* Should I invoke panic? */
}
@@ -359,7 +359,7 @@ rbus_new_root_share(bt, ex, start, size, offset)
{
/* sanity check */
if (start < ex->ex_start || start + size > ex->ex_end) {
- /* out of range: [start, size] should be containd in parent space */
+ /* out of range: [start, size] should be contained in parent space */
return 0;
/* Should I invoke panic? */
}