summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorMartynas Venckus <martynas@cvs.openbsd.org>2008-07-22 11:20:12 +0000
committerMartynas Venckus <martynas@cvs.openbsd.org>2008-07-22 11:20:12 +0000
commit704888d9ed4cd8258d1d918a7483fd0fac6d97d4 (patch)
treeec97b985a7c13e9d651f6390b22d29af3c33abb2 /sys/dev
parentab545f1a9661f0fd5f2471fedb24dc4c46b6bbe2 (diff)
more negotation -> negotiation; ok sthen@
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/mii/dcphy.c4
-rw-r--r--sys/dev/pci/if_em.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/mii/dcphy.c b/sys/dev/mii/dcphy.c
index 0cf7e3be0b7..1806cfbdce3 100644
--- a/sys/dev/mii/dcphy.c
+++ b/sys/dev/mii/dcphy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dcphy.c,v 1.20 2008/07/11 15:00:17 brad Exp $ */
+/* $OpenBSD: dcphy.c,v 1.21 2008/07/22 11:20:10 martynas Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -282,7 +282,7 @@ dcphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
* since real Intel 21143 chips don't show valid link
* status until autonegotiation is switched off, and
* that only happens in dcphy_status(). Without this,
- * successful autonegotation is never recognised on
+ * successful autonegotiation is never recognised on
* these chips.
*/
if (++sc->mii_ticks <= sc->mii_anegticks)
diff --git a/sys/dev/pci/if_em.h b/sys/dev/pci/if_em.h
index a8a137ff553..48b70f2c3bc 100644
--- a/sys/dev/pci/if_em.h
+++ b/sys/dev/pci/if_em.h
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
***************************************************************************/
/* $FreeBSD: if_em.h,v 1.26 2004/09/01 23:22:41 pdeuskar Exp $ */
-/* $OpenBSD: if_em.h,v 1.36 2007/10/21 03:49:54 brad Exp $ */
+/* $OpenBSD: if_em.h,v 1.37 2008/07/22 11:20:10 martynas Exp $ */
#ifndef _EM_H_DEFINED_
#define _EM_H_DEFINED_
@@ -197,7 +197,7 @@ POSSIBILITY OF SUCH DAMAGE.
#define EM_TX_OP_THRESHOLD (sc->num_tx_desc / 32)
/*
- * This parameter controls whether or not autonegotation is enabled.
+ * This parameter controls whether or not autonegotiation is enabled.
* 0 - Disable autonegotiation
* 1 - Enable autonegotiation
*/