Module Name: src
Committed By: dholland
Date: Sun Jan 3 03:50:39 UTC 2010
Modified Files:
src/sys/arch/i386/conf: ALL CARDBUS GENERIC GENERIC_PS2TINY
GENERIC_TINY INSTALL_FLOPPY INSTALL_TINY NET4501 XBOX XEN3_DOM0
XEN3_DOMU
Log Message:
Assorted spelling/capitalization fixes from Igor Sobrado in PR kern/22595.
Merged by yours truly as the set of configs has changed quite a bit since
the PR was filed in 2003, and I may have missed some stuff. These changes
should probably be merged into other arches' configs; I'm not going to do
that now though.
To generate a diff of this commit:
cvs rdiff -u -r1.223 -r1.224 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/i386/conf/CARDBUS
cvs rdiff -u -r1.955 -r1.956 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/i386/conf/GENERIC_PS2TINY
cvs rdiff -u -r1.120 -r1.121 src/sys/arch/i386/conf/GENERIC_TINY
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/i386/conf/INSTALL_FLOPPY
cvs rdiff -u -r1.126 -r1.127 src/sys/arch/i386/conf/INSTALL_TINY
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/i386/conf/NET4501
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/i386/conf/XBOX
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/i386/conf/XEN3_DOMU
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.223 src/sys/arch/i386/conf/ALL:1.224
--- src/sys/arch/i386/conf/ALL:1.223 Wed Dec 23 01:04:46 2009
+++ src/sys/arch/i386/conf/ALL Sun Jan 3 03:50:38 2010
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.223 2009/12/23 01:04:46 pooka Exp $
+# $NetBSD: ALL,v 1.224 2010/01/03 03:50:38 dholland Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.223 $"
+#ident "ALL-$Revision: 1.224 $"
maxusers 64 # estimated number of users
@@ -213,7 +213,7 @@
# Networking options
options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
-options INET6 # IPV6
+options INET6 # IPv6
options IPSEC # IP security
options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
@@ -231,7 +231,7 @@
options IPFILTER_LOOKUP # ippool(8) support
options IPFILTER_DEFAULT_BLOCK # block all packets by default
options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
-options TCP_SIGNATURE # RFC2385 support, used with BGP
+options TCP_SIGNATURE # RFC 2385 support, used with BGP
options ALTQ # Manipulate network interfaces' output queues
options ALTQ_BLUE # Stochastic Fair Blue
@@ -540,7 +540,7 @@
# Console Devices
# wscons
-pckbc0 at isa? # pc keyboard controller
+pckbc0 at isa? # PC keyboard controller
pckbd* at pckbc? # PC keyboard
pms* at pckbc? # PS/2 mouse for wsmouse
options PMS_DISABLE_POWERHOOK # Disable PS/2 reset on resume
@@ -964,7 +964,7 @@
ep* at pci? dev ? function ? # 3Com 3c59x
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
esh* at pci? dev ? function ? # Essential HIPPI card
-ex* at pci? dev ? function ? # 3Com 90x[BC]
+ex* at pci? dev ? function ? # 3Com 3c90x[BC]
fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet
@@ -1017,7 +1017,7 @@
fmv* at isapnp? # Fujitsu FMV-183
le* at isapnp? # AMD PCnet-ISA Ethernet
ne* at isapnp? # NE2000-compatible Ethernet
-tr* at isapnp? # IBM/3COM TROPIC Token-Ring
+tr* at isapnp? # IBM/3Com TROPIC Token-Ring
# PCMCIA network interfaces
an* at pcmcia? function ? # Aironet PC4500/PC4800 (802.11)
@@ -1031,7 +1031,7 @@
sm* at pcmcia? function ? # Megahertz Ethernet
# tr at pcmcia has problems with Cardbus bridges
tr* at pcmcia? function ? # TROPIC based Token-Ring
-wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11)
+wi* at pcmcia? function ? # Lucent/Intersil WaveLAN/IEEE (802.11)
xirc* at pcmcia? function ? # Xircom CreditCard Ethernet
com* at xirc?
xi* at xirc?
@@ -1043,10 +1043,10 @@
ate0 at isa? port 0x2a0 irq ? # AT1700
cs0 at isa? port 0x300 iomem ? irq ? drq ? # CS8900 Ethernet
ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3Com 3c503 Ethernet
-eg0 at isa? port 0x280 irq 9 # 3C505 Ethernet cards
-el0 at isa? port 0x300 irq 9 # 3C501 Ethernet cards
-ep* at isa? port ? irq ? # 3C509 Ethernet cards
-ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3C507
+eg0 at isa? port 0x280 irq 9 # 3c505 Ethernet cards
+el0 at isa? port 0x300 irq 9 # 3c501 Ethernet cards
+ep* at isa? port ? irq ? # 3c509 Ethernet cards
+ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3c507
ai0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN
fmv0 at isa? port 0x2a0 irq ? # FMV-181/182
ix0 at isa? port 0x300 irq 10 # EtherExpress/16
@@ -1064,14 +1064,14 @@
sm0 at isa? port 0x300 irq 10 # SMC91C9x Ethernet
tr0 at isa? port 0xa20 iomem 0xd8000 irq ? # IBM TROPIC based Token-Ring
tr1 at isa? port 0xa24 iomem 0xd0000 irq ? # IBM TROPIC based Token-Ring
-tr* at isa? port ? irq ? # 3COM TROPIC based Token-Ring
+tr* at isa? port ? irq ? # 3Com TROPIC based Token-Ring
we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC Ethernet
we1 at isa? port 0x300 iomem 0xcc000 irq 10
# CardBus network cards
ath* at cardbus? function ? # Atheros 5210/5211/5212 802.11
atw* at cardbus? function ? # ADMtek ADM8211 (802.11)
-ex* at cardbus? function ? # 3Com 3C575TX
+ex* at cardbus? function ? # 3Com 3c575TX
fxp* at cardbus? function ? # Intel i8255x
ral* at cardbus? function ? # Ralink Technology RT25x0 802.11a/b/g
re* at cardbus? function ? # Realtek 8139C+/8169/8169S/8110S
@@ -1568,7 +1568,7 @@
pseudo-device tap # virtual Ethernet
pseudo-device tun # network tunneling over tty
pseudo-device gre # generic L3 over IP tunnel
-pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC1933)
+pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC 1933)
pseudo-device faith # IPv[46] tcp relay translation i/f
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
Index: src/sys/arch/i386/conf/CARDBUS
diff -u src/sys/arch/i386/conf/CARDBUS:1.79 src/sys/arch/i386/conf/CARDBUS:1.80
--- src/sys/arch/i386/conf/CARDBUS:1.79 Tue Sep 30 16:45:33 2008
+++ src/sys/arch/i386/conf/CARDBUS Sun Jan 3 03:50:38 2010
@@ -1,4 +1,4 @@
-# $NetBSD: CARDBUS,v 1.79 2008/09/30 16:45:33 jmcneill Exp $
+# $NetBSD: CARDBUS,v 1.80 2010/01/03 03:50:38 dholland Exp $
#
# CARDBUS: GENERIC + CardBus support
@@ -46,7 +46,7 @@
# CardBus network cards
ath* at cardbus? function ? # Atheros 5210/5211/5212 802.11
atw* at cardbus? function ? # ADMtek ADM8211 (802.11)
-ex* at cardbus? function ? # 3Com 3C575TX
+ex* at cardbus? function ? # 3Com 3c575TX
fxp* at cardbus? function ? # Intel i8255x
rtk* at cardbus? function ? # Realtek 8129/8139
tlp* at cardbus? function ? # DECchip 21143
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.955 src/sys/arch/i386/conf/GENERIC:1.956
--- src/sys/arch/i386/conf/GENERIC:1.955 Wed Dec 23 01:04:46 2009
+++ src/sys/arch/i386/conf/GENERIC Sun Jan 3 03:50:38 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.955 2009/12/23 01:04:46 pooka Exp $
+# $NetBSD: GENERIC,v 1.956 2010/01/03 03:50:38 dholland Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.955 $"
+#ident "GENERIC-$Revision: 1.956 $"
maxusers 64 # estimated number of users
@@ -208,7 +208,7 @@
# Networking options
#options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
-options INET6 # IPV6
+options INET6 # IPv6
#options IPSEC # IP security
#options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
@@ -530,7 +530,7 @@
# Console Devices
# wscons
-pckbc0 at isa? # pc keyboard controller
+pckbc0 at isa? # PC keyboard controller
pckbd* at pckbc? # PC keyboard
pms* at pckbc? # PS/2 mouse for wsmouse
#options PMS_DISABLE_POWERHOOK # Disable PS/2 reset on resume
@@ -915,7 +915,7 @@
ep* at pci? dev ? function ? # 3Com 3c59x
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
esh* at pci? dev ? function ? # Essential HIPPI card
-ex* at pci? dev ? function ? # 3Com 90x[BC]
+ex* at pci? dev ? function ? # 3Com 3c90x[BC]
fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet
@@ -967,7 +967,7 @@
fmv* at isapnp? # Fujitsu FMV-183
le* at isapnp? # AMD PCnet-ISA Ethernet
ne* at isapnp? # NE2000-compatible Ethernet
-tr* at isapnp? # IBM/3COM TROPIC Token-Ring
+tr* at isapnp? # IBM/3Com TROPIC Token-Ring
# PCMCIA network interfaces
an* at pcmcia? function ? # Aironet PC4500/PC4800 (802.11)
@@ -981,7 +981,7 @@
sm* at pcmcia? function ? # Megahertz Ethernet
# tr at pcmcia has problems with Cardbus bridges
#tr* at pcmcia? function ? # TROPIC based Token-Ring
-wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11)
+wi* at pcmcia? function ? # Lucent/Intersil WaveLAN/IEEE (802.11)
xirc* at pcmcia? function ? # Xircom CreditCard Ethernet
com* at xirc?
xi* at xirc?
@@ -993,10 +993,10 @@
ate0 at isa? port 0x2a0 irq ? # AT1700
cs0 at isa? port 0x300 iomem ? irq ? drq ? # CS8900 Ethernet
ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3Com 3c503 Ethernet
-eg0 at isa? port 0x280 irq 9 # 3C505 Ethernet cards
-el0 at isa? port 0x300 irq 9 # 3C501 Ethernet cards
-ep* at isa? port ? irq ? # 3C509 Ethernet cards
-ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3C507
+eg0 at isa? port 0x280 irq 9 # 3c505 Ethernet cards
+el0 at isa? port 0x300 irq 9 # 3c501 Ethernet cards
+ep* at isa? port ? irq ? # 3c509 Ethernet cards
+ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3c507
ai0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN
fmv0 at isa? port 0x2a0 irq ? # FMV-181/182
ix0 at isa? port 0x300 irq 10 # EtherExpress/16
@@ -1014,14 +1014,14 @@
sm0 at isa? port 0x300 irq 10 # SMC91C9x Ethernet
tr0 at isa? port 0xa20 iomem 0xd8000 irq ? # IBM TROPIC based Token-Ring
tr1 at isa? port 0xa24 iomem 0xd0000 irq ? # IBM TROPIC based Token-Ring
-tr* at isa? port ? irq ? # 3COM TROPIC based Token-Ring
+tr* at isa? port ? irq ? # 3Com TROPIC based Token-Ring
we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC Ethernet
we1 at isa? port 0x300 iomem 0xcc000 irq 10
# CardBus network cards
ath* at cardbus? function ? # Atheros 5210/5211/5212 802.11
atw* at cardbus? function ? # ADMtek ADM8211 (802.11)
-ex* at cardbus? function ? # 3Com 3C575TX
+ex* at cardbus? function ? # 3Com 3c575TX
fxp* at cardbus? function ? # Intel i8255x
ral* at cardbus? function ? # Ralink Technology RT25x0 802.11a/b/g
re* at cardbus? function ? # Realtek 8139C+/8169/8169S/8110S
@@ -1511,8 +1511,8 @@
pseudo-device tap # virtual Ethernet
pseudo-device tun # network tunneling over tty
pseudo-device gre # generic L3 over IP tunnel
-pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device faith # IPv[46] tcp relay translation i/f
+pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC 1933)
+#pseudo-device faith # IPv[46] TCP relay translation i/f
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
Index: src/sys/arch/i386/conf/GENERIC_PS2TINY
diff -u src/sys/arch/i386/conf/GENERIC_PS2TINY:1.57 src/sys/arch/i386/conf/GENERIC_PS2TINY:1.58
--- src/sys/arch/i386/conf/GENERIC_PS2TINY:1.57 Sat Dec 5 20:11:15 2009
+++ src/sys/arch/i386/conf/GENERIC_PS2TINY Sun Jan 3 03:50:38 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_PS2TINY,v 1.57 2009/12/05 20:11:15 pooka Exp $
+# $NetBSD: GENERIC_PS2TINY,v 1.58 2010/01/03 03:50:38 dholland Exp $
#
# GENERIC-style kernel config for IBM PS/2 with MCA bus. It only contains
# IBM PS/2 related stuff and has been generally trimmed down somewhat,
@@ -98,7 +98,7 @@
# Networking options
#options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
-options INET6 # IPV6
+options INET6 # IPv6
#options IPSEC # IP security
#options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
@@ -163,7 +163,7 @@
#npx0 at isa? port 0xf0 irq 13 # x86 math coprocessor
# wscons
-pckbc0 at isa? # pc keyboard controller
+pckbc0 at isa? # PC keyboard controller
options PCKBCDEBUG
#pcconskbd* at pckbc?
#pms* at pckbc? # PS/2 mouse for wsmouse
Index: src/sys/arch/i386/conf/GENERIC_TINY
diff -u src/sys/arch/i386/conf/GENERIC_TINY:1.120 src/sys/arch/i386/conf/GENERIC_TINY:1.121
--- src/sys/arch/i386/conf/GENERIC_TINY:1.120 Sat Dec 5 20:11:15 2009
+++ src/sys/arch/i386/conf/GENERIC_TINY Sun Jan 3 03:50:38 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_TINY,v 1.120 2009/12/05 20:11:15 pooka Exp $
+# $NetBSD: GENERIC_TINY,v 1.121 2010/01/03 03:50:38 dholland Exp $
#
# GENERIC_TINY -- suitable default for 4M machines
# No EISA, PCI, or SCSI.
@@ -243,7 +243,7 @@
# Console Devices
# wscons
-pckbc0 at isa? # pc keyboard controller
+pckbc0 at isa? # PC keyboard controller
pckbd* at pckbc? # PC keyboard
#pms* at pckbc? # PS/2 mouse for wsmouse
vga0 at isa?
@@ -423,10 +423,10 @@
# ISA network interfaces
ate0 at isa? port 0x2a0 irq ? # AT1700
ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3Com 3c503 Ethernet
-eg0 at isa? port 0x280 irq 9 # 3C505 ethernet cards
-el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards
-ep0 at isa? port ? irq ? # 3C509 ethernet cards
-ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3C507
+eg0 at isa? port 0x280 irq 9 # 3c505 Ethernet cards
+el0 at isa? port 0x300 irq 9 # 3c501 Ethernet cards
+ep0 at isa? port ? irq ? # 3c509 Ethernet cards
+ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3c507
ai0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN
fmv0 at isa? port 0x2a0 irq ? # FMV-180 series
ix0 at isa? port 0x300 irq 10 # EtherExpress/16
@@ -438,7 +438,7 @@
le* at nele?
bicc0 at isa? port 0x320 irq 10 drq 7 # BICC IsoLan
le* at bicc?
-ne0 at isa? port 0x280 irq 9 # NE[12]000 ethernet cards
+ne0 at isa? port 0x280 irq 9 # NE[12]000 Ethernet cards
ne1 at isa? port 0x300 irq 10
sm0 at isa? port 0x300 irq 10 # SMC91C9x Ethernet
we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC Ethernet
Index: src/sys/arch/i386/conf/INSTALL_FLOPPY
diff -u src/sys/arch/i386/conf/INSTALL_FLOPPY:1.6 src/sys/arch/i386/conf/INSTALL_FLOPPY:1.7
--- src/sys/arch/i386/conf/INSTALL_FLOPPY:1.6 Sat Dec 5 20:11:15 2009
+++ src/sys/arch/i386/conf/INSTALL_FLOPPY Sun Jan 3 03:50:38 2010
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_FLOPPY,v 1.6 2009/12/05 20:11:15 pooka Exp $
+# $NetBSD: INSTALL_FLOPPY,v 1.7 2010/01/03 03:50:38 dholland Exp $
#
# INSTALL - Installation kernel.
#
@@ -251,7 +251,7 @@
# Console Devices
# wscons
-pckbc0 at isa? # pc keyboard controller
+pckbc0 at isa? # PC keyboard controller
pckbd* at pckbc? # PC keyboard
#pms* at pckbc? # PS/2 mouse for wsmouse
vga0 at isa?
@@ -499,7 +499,7 @@
# bnx* at pci? dev ? function ? # Broadcom NetXtremeII gigabit Ethernet
#en* at pci? dev ? function ? # ENI/Adaptec ATM
ep* at pci? dev ? function ? # 3Com 3c59x
-ex* at pci? dev ? function ? # 3Com 90x[BC]
+ex* at pci? dev ? function ? # 3Com 3c90x[BC]
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
#esh* at pci? dev ? function ? # Essential HIPPI card
fpa* at pci? dev ? function ? # DEC DEFPA FDDI
@@ -546,7 +546,7 @@
fmv* at isapnp? # Fujitsu FMV-183
le* at isapnp? # AMD PCnet-ISA Ethernet
ne* at isapnp? # NE2000-compatible Ethernet
-tr* at isapnp? # IBM/3COM TROPIC Token-Ring
+tr* at isapnp? # IBM/3Com TROPIC Token-Ring
# PCMCIA network interfaces
an* at pcmcia? function ? # Aironet PC4500/PC4800 (802.11)
@@ -558,7 +558,7 @@
ne* at pcmcia? function ? # NE2000-compatible Ethernet
ray* at pcmcia? function ? # Raytheon Raylink (802.11)
sm* at pcmcia? function ? # Megahertz Ethernet
-wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11)
+wi* at pcmcia? function ? # Lucent/Intersil WaveLAN/IEEE (802.11)
options WI_PCMCIA_SPECTRUM24T_FW=0
xirc* at pcmcia? function ? # Xircom CreditCard Ethernet
com* at xirc?
@@ -571,10 +571,10 @@
ate0 at isa? port 0x2a0 irq ? # AT1700
cs0 at isa? port 0x300 iomem ? irq ? drq ? # CS8900 Ethernet
ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3Com 3c503 Ethernet
-eg0 at isa? port 0x280 irq 9 # 3C505 ethernet cards
-el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards
-ep* at isa? port ? irq ? # 3C509 ethernet cards
-ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3C507
+eg0 at isa? port 0x280 irq 9 # 3c505 Ethernet cards
+el0 at isa? port 0x300 irq 9 # 3c501 Ethernet cards
+ep* at isa? port ? irq ? # 3c509 Ethernet cards
+ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3c507
ai0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN
fmv0 at isa? port 0x2a0 irq ? # FMV-181/182
ix0 at isa? port 0x300 irq 10 # EtherExpress/16
@@ -586,12 +586,12 @@
le* at nele?
bicc0 at isa? port 0x320 irq 10 drq 7 # BICC IsoLan
le* at bicc?
-ne0 at isa? port 0x280 irq 9 # NE[12]000 ethernet cards
+ne0 at isa? port 0x280 irq 9 # NE[12]000 Ethernet cards
ne1 at isa? port 0x300 irq 10
sm0 at isa? port 0x300 irq 10 # SMC91C9x Ethernet
tr0 at isa? port 0xa20 iomem 0xd8000 irq ? # IBM TROPIC based Token-Ring
tr1 at isa? port 0xa24 iomem 0xd0000 irq ? # IBM TROPIC based Token-Ring
-tr* at isa? port ? irq ? # 3COM TROPIC based Token-Ring
+tr* at isa? port ? irq ? # 3Com TROPIC based Token-Ring
we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC Ethernet
we1 at isa? port 0x300 iomem 0xcc000 irq 10
Index: src/sys/arch/i386/conf/INSTALL_TINY
diff -u src/sys/arch/i386/conf/INSTALL_TINY:1.126 src/sys/arch/i386/conf/INSTALL_TINY:1.127
--- src/sys/arch/i386/conf/INSTALL_TINY:1.126 Sat Dec 5 20:11:15 2009
+++ src/sys/arch/i386/conf/INSTALL_TINY Sun Jan 3 03:50:38 2010
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_TINY,v 1.126 2009/12/05 20:11:15 pooka Exp $
+# $NetBSD: INSTALL_TINY,v 1.127 2010/01/03 03:50:38 dholland Exp $
#
# This kernel should be derived from INSTALL (which is derived
# from GENERIC) with some features commented out.
@@ -233,7 +233,7 @@
# Console Devices
# wscons
-pckbc0 at isa? # pc keyboard controller
+pckbc0 at isa? # PC keyboard controller
pckbd* at pckbc? # PC keyboard
pcdisplay0 at isa? # CGA, MDA, EGA, HGA
wsdisplay* at pcdisplay? console ?
@@ -428,10 +428,10 @@
# ISA network interfaces
ate0 at isa? port 0x2a0 irq ? # AT1700
ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3Com 3c503 Ethernet
-#eg0 at isa? port 0x280 irq 9 # 3C505 ethernet cards
-#el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards
-ep0 at isa? port ? irq ? # 3C509 ethernet cards
-#ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3C507
+#eg0 at isa? port 0x280 irq 9 # 3c505 Ethernet cards
+#el0 at isa? port 0x300 irq 9 # 3c501 Ethernet cards
+ep0 at isa? port ? irq ? # 3c509 Ethernet cards
+#ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3c507
ai0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN
fmv0 at isa? port 0x2a0 irq ? # FMV-180 series
ix0 at isa? port 0x300 irq 10 # EtherExpress/16
@@ -443,7 +443,7 @@
#le* at nele?
#bicc0 at isa? port 0x320 irq 10 drq 7 # BICC IsoLan
#le* at bicc?
-ne0 at isa? port 0x280 irq 9 # NE[12]000 ethernet cards
+ne0 at isa? port 0x280 irq 9 # NE[12]000 Ethernet cards
ne1 at isa? port 0x300 irq 10
sm0 at isa? port 0x300 irq 10 # SMC91C9x Ethernet
we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC Ethernet
Index: src/sys/arch/i386/conf/NET4501
diff -u src/sys/arch/i386/conf/NET4501:1.69 src/sys/arch/i386/conf/NET4501:1.70
--- src/sys/arch/i386/conf/NET4501:1.69 Sat Dec 5 20:11:15 2009
+++ src/sys/arch/i386/conf/NET4501 Sun Jan 3 03:50:38 2010
@@ -1,4 +1,4 @@
-# $NetBSD: NET4501,v 1.69 2009/12/05 20:11:15 pooka Exp $
+# $NetBSD: NET4501,v 1.70 2010/01/03 03:50:38 dholland Exp $
#
# NET4501 -- kernel configuration for a Soekris Engineering net4501
# single-board computer.
@@ -10,7 +10,7 @@
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "NET4501-$Revision: 1.69 $"
+#ident "NET4501-$Revision: 1.70 $"
maxusers 32 # estimated number of users
@@ -133,7 +133,7 @@
# Networking options
options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
-options INET6 # IPV6
+options INET6 # IPv6
#options IPSEC # IP security
#options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
@@ -258,7 +258,7 @@
# PCMCIA network interfaces
awi* at pcmcia? function ?
-wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11)
+wi* at pcmcia? function ? # Lucent/Intersil WaveLAN/IEEE (802.11)
# MII/PHY support
nsphyter* at mii? phy ? # NS83843 PHYs
@@ -278,8 +278,8 @@
pseudo-device tun # network tunneling over tty
pseudo-device tap # virtual Ethernet
pseudo-device gre # generic L3 over IP tunnel
-pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC1933)
-pseudo-device faith # IPv[46] tcp relay translation i/f
+pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC 1933)
+pseudo-device faith # IPv[46] TCP relay translation i/f
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
Index: src/sys/arch/i386/conf/XBOX
diff -u src/sys/arch/i386/conf/XBOX:1.17 src/sys/arch/i386/conf/XBOX:1.18
--- src/sys/arch/i386/conf/XBOX:1.17 Wed Dec 23 01:04:46 2009
+++ src/sys/arch/i386/conf/XBOX Sun Jan 3 03:50:38 2010
@@ -1,4 +1,4 @@
-# $NetBSD: XBOX,v 1.17 2009/12/23 01:04:46 pooka Exp $
+# $NetBSD: XBOX,v 1.18 2010/01/03 03:50:38 dholland Exp $
#
# XBOX -- A basic Microsoft XBox kernel config file.
#
@@ -12,7 +12,7 @@
options MSGBUFSIZE=65536 # for PCI_CONFIG_DUMP space
-#options NFS_BOOT_RWSIZE=1024 # kue0 USB ethernet has issues here
+#options NFS_BOOT_RWSIZE=1024 # kue0 USB Ethernet has issues here
options TIMER_FREQ=1125000
options XBOX # kernel support for xbox
@@ -52,7 +52,7 @@
# Networking options
options INET # IP + ICMP + TCP + UDP
-#options INET6 # IPV6
+#options INET6 # IPv6
# These options enable verbose messages for several subsystems.
# Warning, these may compile large string tables into the kernel!
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.24 src/sys/arch/i386/conf/XEN3_DOM0:1.25
--- src/sys/arch/i386/conf/XEN3_DOM0:1.24 Thu Dec 17 23:53:24 2009
+++ src/sys/arch/i386/conf/XEN3_DOM0 Sun Jan 3 03:50:38 2010
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.24 2009/12/17 23:53:24 jym Exp $
+# $NetBSD: XEN3_DOM0,v 1.25 2010/01/03 03:50:38 dholland Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -140,7 +140,7 @@
# Networking options
#options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
-options INET6 # IPV6
+options INET6 # IPv6
#options IPSEC # IP security
#options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
@@ -302,7 +302,7 @@
ep* at pci? dev ? function ? # 3Com 3c59x
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
esh* at pci? dev ? function ? # Essential HIPPI card
-ex* at pci? dev ? function ? # 3Com 90x[BC]
+ex* at pci? dev ? function ? # 3Com 3c90x[BC]
fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet
@@ -310,7 +310,7 @@
ipw* at pci? dev ? function ? # Intel PRO/Wireless 2100
iwi* at pci? dev ? function ? # Intel PRO/Wireless 2200BG
iwn* at pci? dev ? function ? # Intel PRO/Wireless 4965AGN
-jme* at pci? dev ? function ? # JMicron JMC2[56]0 ethernet
+jme* at pci? dev ? function ? # JMicron JMC2[56]0 Ethernet
le* at pci? dev ? function ? # PCnet-PCI Ethernet
lii* at pci? dev ? function ? # Atheros L2 Fast-Ethernet
lmc* at pci? dev ? function ? # Lan Media Corp SSI/HSSI/DS3
@@ -491,7 +491,7 @@
icpsp* at icp? unit ? # SCSI pass-through
# wscons
-pckbc0 at isa? # pc keyboard controller
+pckbc0 at isa? # PC keyboard controller
pckbd* at pckbc? # PC keyboard
pms* at pckbc? # PS/2 mouse for wsmouse
#options PMS_DISABLE_POWERHOOK # Disable PS/2 reset on resume
@@ -758,7 +758,7 @@
pseudo-device tap # virtual Ethernet
pseudo-device tun # network tunneling over tty
pseudo-device gre # generic L3 over IP tunnel
-pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC1933)
+pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC 1933)
#pseudo-device faith # IPv[46] tcp relay translation i/f
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
Index: src/sys/arch/i386/conf/XEN3_DOMU
diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.20 src/sys/arch/i386/conf/XEN3_DOMU:1.21
--- src/sys/arch/i386/conf/XEN3_DOMU:1.20 Thu Dec 17 23:53:24 2009
+++ src/sys/arch/i386/conf/XEN3_DOMU Sun Jan 3 03:50:38 2010
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.20 2009/12/17 23:53:24 jym Exp $
+# $NetBSD: XEN3_DOMU,v 1.21 2010/01/03 03:50:38 dholland Exp $
include "arch/xen/conf/std.xen"
@@ -121,7 +121,7 @@
# Networking options
#options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
-options INET6 # IPV6
+options INET6 # IPv6
#options IPSEC # IP security
#options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
@@ -218,7 +218,7 @@
pseudo-device tap # virtual Ethernet
pseudo-device tun # network tunneling over tty
pseudo-device gre # generic L3 over IP tunnel
-pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC1933)
+pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC 1933)
#pseudo-device faith # IPv[46] tcp relay translation i/f
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
