Module Name: src
Committed By: dholland
Date: Sun Jan 3 03:53:34 UTC 2010
Modified Files:
src/sys/arch/i386/conf: ALL CARDBUS GENERIC GENERIC_ISDN
GENERIC_PS2TINY GENERIC_TINY INSTALL_FLOPPY INSTALL_PS2
INSTALL_TINY INSTALL_XEN3PAE_DOMU INSTALL_XEN3_DOMU NET4501 XBOX
XEN3_DOM0 XEN3_DOMU
Log Message:
Whitespace. Portions from Igor Sobrado in PR kern/22595.
Deploy <space><tab> where needed so columns don't teleport when
commenting or uncommenting things.
To generate a diff of this commit:
cvs rdiff -u -r1.224 -r1.225 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.80 -r1.81 src/sys/arch/i386/conf/CARDBUS
cvs rdiff -u -r1.956 -r1.957 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/i386/conf/GENERIC_ISDN
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/i386/conf/GENERIC_PS2TINY
cvs rdiff -u -r1.121 -r1.122 src/sys/arch/i386/conf/GENERIC_TINY
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/i386/conf/INSTALL_FLOPPY
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/i386/conf/INSTALL_PS2 \
src/sys/arch/i386/conf/INSTALL_XEN3_DOMU
cvs rdiff -u -r1.127 -r1.128 src/sys/arch/i386/conf/INSTALL_TINY
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/i386/conf/INSTALL_XEN3PAE_DOMU
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/i386/conf/NET4501
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/i386/conf/XBOX
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.21 -r1.22 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.224 src/sys/arch/i386/conf/ALL:1.225
--- src/sys/arch/i386/conf/ALL:1.224 Sun Jan 3 03:50:38 2010
+++ src/sys/arch/i386/conf/ALL Sun Jan 3 03:53:34 2010
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.224 2010/01/03 03:50:38 dholland Exp $
+# $NetBSD: ALL,v 1.225 2010/01/03 03:53:34 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.224 $"
+#ident "ALL-$Revision: 1.225 $"
maxusers 64 # estimated number of users
@@ -45,7 +45,7 @@
options INTEL_ONDEMAND_CLOCKMOD
# XBOX support
-options XBOX
+options XBOX
options MTRR # memory-type range register syscall support
# doesn't work with MP just yet..
@@ -563,7 +563,7 @@
wsdisplay* at unichromefb?
# XBOX framebuffer console
-xboxfb0 at pci? dev ? function ?
+xboxfb0 at pci? dev ? function ?
wsdisplay* at xboxfb? console ?
# DRI driver
@@ -661,11 +661,11 @@
options VIA_C7TEMP
# Intel ICH SMBus controller
-ichsmb* at pci? dev ? function ?
+ichsmb* at pci? dev ? function ?
iic* at ichsmb?
# NVIDIA nForce2/3/4 SMBus controller
-nfsmbc* at pci? dev ? function ?
+nfsmbc* at pci? dev ? function ?
nfsmb* at nfsmbc?
iic* at nfsmb?
@@ -710,11 +710,11 @@
viaenv* at pci? dev ? function ?
# Serial Presence Detect capable memory modules and optional temp sensors
-spdmem* at iic? addr 0x50
-spdmem* at iic? addr 0x51
-spdmem* at iic? addr 0x52
-spdmem* at iic? addr 0x53
-sdtemp* at iic? addr 0x18
+spdmem* at iic? addr 0x50
+spdmem* at iic? addr 0x51
+spdmem* at iic? addr 0x52
+spdmem* at iic? addr 0x53
+sdtemp* at iic? addr 0x18
# I2O devices
iop* at pci? dev ? function ? # I/O processor
@@ -858,9 +858,9 @@
hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers
iteide* at pci? dev ? function ? # IT Express IDE controllers
ixpide* at pci? dev ? function ? # ATI IXP IDE controllers
-jmide* at pci? dev ? function ? # JMicron PCI-e PATA/SATA controllers
+jmide* at pci? dev ? function ? # JMicron PCI-e PATA/SATA controllers
ahcisata* at jmide?
-mvsata* at pci? dev ? function ? # Marvell Hercules-I/II
+mvsata* at pci? dev ? function ? # Marvell Hercules-I/II
optiide* at pci? dev ? function ? # Opti IDE controllers
piixide* at pci? dev ? function ? # Intel IDE controllers
pdcide* at pci? dev ? function ? # Promise IDE controllers
@@ -883,7 +883,7 @@
# CardBus IDE controllers
njata* at cardbus? function ? flags 0x01 # Workbit NinjaATA-32
-siisata* at cardbus? function ? # SiI SteelVine controllers
+siisata* at cardbus? function ? # SiI SteelVine controllers
# ISA ST506, ESDI, and IDE controllers
# Use flags 0x01 if you want to try to use 32bits data I/O (the driver will
@@ -1152,7 +1152,7 @@
uhub* at uhub? port ?
# USB HID device
-uhidev* at uhub? port ? configuration ? interface ?
+uhidev* at uhub? port ? configuration ? interface ?
# USB Mice
ums* at uhidev? reportid ?
@@ -1167,7 +1167,7 @@
wskbd* at ukbd? console ? mux 1
# USB serial adapter
-ucycom* at uhidev? reportid ?
+ucycom* at uhidev? reportid ?
# USB Generic HID devices
uhid* at uhidev? reportid ?
@@ -1180,7 +1180,7 @@
ulpt* at uhub? port ? configuration ? interface ?
# USB Modem
-umodem* at uhub? port ? configuration ?
+umodem* at uhub? port ? configuration ?
ucom* at umodem?
# Huawei E220 3G/HSDPA modem
@@ -1192,7 +1192,7 @@
wd* at umass?
# USB audio
-uaudio* at uhub? port ? configuration ?
+uaudio* at uhub? port ? configuration ?
# USB MIDI
umidi* at uhub? port ? configuration ?
@@ -1231,7 +1231,7 @@
ubsa* at uhub? port ? # Belkin serial adapter
ucom* at ubsa? portno ?
-uchcom* at uhub? port ? # WinChipHead CH341/CH340 serial adapter
+uchcom* at uhub? port ? # WinChipHead CH341/CH340 serial adapter
ucom* at uchcom? portno ?
uftdi* at uhub? port ? # FTDI FT8U100AX serial adapter
@@ -1253,13 +1253,13 @@
ucom* at uvscom? portno ?
# RIM BlackBerry
-uberry* at uhub? port ?
+uberry* at uhub? port ?
# Diamond Multimedia Rio 500
urio* at uhub? port ?
# USB Handspring Visor
-uvisor* at uhub? port ?
+uvisor* at uhub? port ?
ucom* at uvisor?
# Kyocera AIR-EDGE PHONE
@@ -1273,7 +1273,7 @@
usscanner* at uhub? port ?
# Topfield TF5000PVR range of DVB recorders
-utoppy* at uhub? port ?
+utoppy* at uhub? port ?
# y...@p firmware loader
uyap* at uhub? port ?
@@ -1283,7 +1283,7 @@
radio* at udsbr?
# XBOX controller
-xboxcontroller* at uhub? port ?
+xboxcontroller* at uhub? port ?
wsmouse* at xboxcontroller? mux 0
# USB Generic driver
@@ -1294,7 +1294,7 @@
ucom* at u3g?
# USB generic serial port (e.g., data over cellular)
-ugensa* at uhub? port ?
+ugensa* at uhub? port ?
ucom* at ugensa?
# IrDA and Consumer Ir devices
@@ -1305,10 +1305,10 @@
# PCI IEEE1394 controllers
-fwohci* at pci? dev ? function ? # IEEE1394 Open Host Controller
+fwohci* at pci? dev ? function ? # IEEE1394 Open Host Controller
# CardBus IEEE1394 controllers
-fwohci* at cardbus? function ? # IEEE1394 Open Host Controller
+fwohci* at cardbus? function ? # IEEE1394 Open Host Controller
ieee1394if* at fwohci?
fwip* at ieee1394if? # IP over IEEE1394
@@ -1319,7 +1319,7 @@
# SD/MMC controller
sdhc* at pci? # SD Host Controller
-sdmmc* at sdhc? # SD/MMC bus
+sdmmc* at sdhc? # SD/MMC bus
ld* at sdmmc?
@@ -1332,7 +1332,7 @@
auixp* at pci? dev ? function ? # ATI IXP AC'97 Audio
autri* at pci? dev ? function ? # Trident 4DWAVE based AC'97 Audio
auvia* at pci? dev ? function ? # VIA VT82C686A integrated AC'97 Audio
-azalia* at pci? dev ? function ? # High Definition Audio
+azalia* at pci? dev ? function ? # High Definition Audio
clcs* at pci? dev ? function ? # Cirrus Logic CS4280
clct* at pci? dev ? function ? # Cirrus Logic CS4281
cmpci* at pci? dev ? function ? # C-Media CMI8338/8738
@@ -1426,7 +1426,7 @@
# Video capture devices
-pseye* at uhub? # Sony PLAYSTATION(R) Eye webcam
+pseye* at uhub? # Sony PLAYSTATION(R) Eye webcam
uvideo* at uhub? # USB Video Class capture devices
video* at videobus?
@@ -1434,10 +1434,10 @@
# TV cards
# Brooktree 848/849/878/879 based TV cards
-bktr* at pci? dev ? function ?
-radio* at bktr?
+bktr* at pci? dev ? function ?
+radio* at bktr?
-isv* at isa? port 0x3e0 # IDEC Supervision/16 image capture
+isv* at isa? port 0x3e0 # IDEC Supervision/16 image capture
# Bluetooth Controller and Device support
@@ -1522,7 +1522,7 @@
weasel* at pci?
# Pull in optional local configuration
-#include "arch/i386/conf/ALL.local"
+#include "arch/i386/conf/ALL.local"
# Pseudo-Devices
Index: src/sys/arch/i386/conf/CARDBUS
diff -u src/sys/arch/i386/conf/CARDBUS:1.80 src/sys/arch/i386/conf/CARDBUS:1.81
--- src/sys/arch/i386/conf/CARDBUS:1.80 Sun Jan 3 03:50:38 2010
+++ src/sys/arch/i386/conf/CARDBUS Sun Jan 3 03:53:34 2010
@@ -1,9 +1,9 @@
-# $NetBSD: CARDBUS,v 1.80 2010/01/03 03:50:38 dholland Exp $
+# $NetBSD: CARDBUS,v 1.81 2010/01/03 03:53:34 dholland Exp $
#
# CARDBUS: GENERIC + CardBus support
include "arch/i386/conf/GENERIC"
-
+
# Following makes ARMADA M700's happy
#options RBUS_MIN_START=0x20000000
#options RBUS_IO_BASE=0x600
@@ -20,26 +20,26 @@
options PCI_ADDR_FIXUP # fixup PCI I/O addresses
options PCI_BUS_FIXUP # fixup PCI bus numbering
options PCI_INTR_FIXUP # fixup PCI interrupt routing
-
- # Cardbus bridges
+
+# Cardbus bridges
ppb* at cardbus? function ? # Cardbus-PCI bridges (www.magma.com)
-
- # CardBus bridge support
+
+# CardBus bridge support
cbb* at pci? dev ? function ?
cardslot* at cbb?
-
+
# CardBus bus support
cardbus* at cardslot?
-pcmcia* at cardslot?
-
+pcmcia* at cardslot?
+
# CardBus serial interfaces
com* at cardbus? function ? # Modems and serial cards
-
+
# CardBus SCSI cards
adv* at cardbus? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI
ahc* at cardbus? function ? # Adaptec ADP-1480
njs* at cardbus? function ? # Workbit NinjaSCSI-32
-
+
# CardBus IDE controllers
njata* at cardbus? function ? flags 0x01 # Workbit NinjaATA-32
@@ -50,7 +50,7 @@
fxp* at cardbus? function ? # Intel i8255x
rtk* at cardbus? function ? # Realtek 8129/8139
tlp* at cardbus? function ? # DECchip 21143
-
+
# CardBus USB controllers
ehci* at cardbus? function ? # Enhanced Host Controller
ohci* at cardbus? function ? # Open Host Controller
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.956 src/sys/arch/i386/conf/GENERIC:1.957
--- src/sys/arch/i386/conf/GENERIC:1.956 Sun Jan 3 03:50:38 2010
+++ src/sys/arch/i386/conf/GENERIC Sun Jan 3 03:53:34 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.956 2010/01/03 03:50:38 dholland Exp $
+# $NetBSD: GENERIC,v 1.957 2010/01/03 03:53:34 dholland Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.956 $"
+#ident "GENERIC-$Revision: 1.957 $"
maxusers 64 # estimated number of users
@@ -172,27 +172,27 @@
#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
# File systems, built as modules by default
-#file-system FFS # UFS
-#file-system EXT2FS # second extended file system (linux)
-#file-system LFS # log-structured file system
-#file-system MFS # memory file system
-#file-system NFS # Network File System client
-#file-system NTFS # Windows/NT file system (experimental)
-#file-system CD9660 # ISO 9660 + Rock Ridge file system
-#file-system MSDOSFS # MS-DOS file system
-#file-system FDESC # /dev/fd
-#file-system KERNFS # /kern
-#file-system NULLFS # loopback file system
-#file-system OVERLAY # overlay file system
-#file-system PROCFS # /proc
-#file-system UMAPFS # NULLFS + uid and gid remapping
-#file-system UNION # union file system
-#file-system CODA # Coda File System; also needs vcoda (below)
-#file-system SMBFS # experimental - CIFS; also needs nsmb (below)
-#file-system PTYFS # /dev/ptm support
-#file-system TMPFS # Efficient memory file-system
-#file-system UDF # experimental - OSTA UDF CD/DVD file-system
-#file-system HFS # experimental - Apple HFS+ (read-only)
+#file-system FFS # UFS
+#file-system EXT2FS # second extended file system (linux)
+#file-system LFS # log-structured file system
+#file-system MFS # memory file system
+#file-system NFS # Network File System client
+#file-system NTFS # Windows/NT file system (experimental)
+#file-system CD9660 # ISO 9660 + Rock Ridge file system
+#file-system MSDOSFS # MS-DOS file system
+#file-system FDESC # /dev/fd
+#file-system KERNFS # /kern
+#file-system NULLFS # loopback file system
+#file-system OVERLAY # overlay file system
+#file-system PROCFS # /proc
+#file-system UMAPFS # NULLFS + uid and gid remapping
+#file-system UNION # union file system
+#file-system CODA # Coda File System; also needs vcoda (below)
+#file-system SMBFS # experimental - CIFS; also needs nsmb (below)
+#file-system PTYFS # /dev/ptm support
+#file-system TMPFS # Efficient memory file-system
+#file-system UDF # experimental - OSTA UDF CD/DVD file-system
+#file-system HFS # experimental - Apple HFS+ (read-only)
#file-system NILFS # experimental - NTT's NiLFS(2)
# File system options
@@ -317,9 +317,9 @@
#
# Doesn't do anything yet.
-#p64h2apic* at pci? dev? function? # P64H2 IOxAPIC
+#p64h2apic* at pci? dev? function? # P64H2 IOxAPIC
-#apm0 at mainbus0 # Advanced power management
+#apm0 at mainbus0 # Advanced power management
# Tuning for power management, see apm(4) for more details.
#options APM_NO_IDLE # Don't call BIOS CPU idle function
@@ -349,16 +349,16 @@
# ACPI devices
apm* at acpi? # ACPI apm emulation
-acpiacad* at acpi? # ACPI AC Adapter
-acpibat* at acpi? # ACPI Battery
-acpibut* at acpi? # ACPI Button
+acpiacad* at acpi? # ACPI AC Adapter
+acpibat* at acpi? # ACPI Battery
+acpibut* at acpi? # ACPI Button
acpidalb* at acpi? # ACPI Direct Application Launch Button
# The ACPI Embedded Controller is generally configured via the special ECDT.
# This is required as parts of the DSDT can reference the EC before the normal
# attach phase.
acpiec* at acpi? # ACPI Embedded Controller (late binding)
-acpiecdt* at acpi? # ACPI Embedded Controller (early binding)
-acpilid* at acpi? # ACPI Lid Switch
+acpiecdt* at acpi? # ACPI Embedded Controller (early binding)
+acpilid* at acpi? # ACPI Lid Switch
acpitz* at acpi? # ACPI Thermal Zone
acpiwmi* at acpi? # ACPI WMI Mapper
@@ -366,32 +366,32 @@
aiboost* at acpi? # ASUS AI Booster Hardware Monitor
asus* at acpi? # ASUS hotkeys
attimer* at acpi? # AT Timer
-#com* at acpi? # Serial communications interface
-#fdc* at acpi? # Floppy disk controller
+#com* at acpi? # Serial communications interface
+#fdc* at acpi? # Floppy disk controller
hpqlb* at acpi? # HP Quick Launch Buttons
-hpet* at acpi? # High Precision Event Timer
+hpet* at acpi? # High Precision Event Timer
joy* at acpi? # Joystick/Game port
-#lpt* at acpi? # Parallel port
+#lpt* at acpi? # Parallel port
mpu* at acpi? # Roland MPU-401 MIDI UART
npx* at acpi? # Math coprocessor
-pckbc* at acpi? # PC keyboard controller
+pckbc* at acpi? # PC keyboard controller
pcppi* at acpi? # AT-style speaker sound
thinkpad* at acpi? # IBM/Lenovo Thinkpad hotkeys
-ug* at acpi? # Abit uGuru Hardware monitor
+ug* at acpi? # Abit uGuru Hardware monitor
wb* at acpi? # Winbond W83L518D SD/MMC reader
sdmmc* at wb? # SD/MMC bus
-wss* at acpi? # NeoMagic 256AV in wss mode
-ym* at acpi? # Yamaha OPL3-SA[23] audio
+wss* at acpi? # NeoMagic 256AV in wss mode
+ym* at acpi? # Yamaha OPL3-SA[23] audio
# Sony Vaio jog dial
-spic* at acpi? # Sony Programmable I/O Controller
-wsmouse* at spic?
+spic* at acpi? # Sony Programmable I/O Controller
+wsmouse* at spic?
# Sony LCD brightness etc.
sony* at acpi? # Sony Miscellaneous Controller
# Toshiba Libretto devices
-vald* at acpi?
+vald* at acpi?
# Plug-and-Play BIOS and attached devices
@@ -544,7 +544,7 @@
wsdisplay* at vga? console ?
wsdisplay* at pcdisplay? console ?
wsdisplay* at wsemuldisplaydev?
-#wsdisplay* at machfb? console ?
+#wsdisplay* at machfb? console ?
wskbd* at pckbd? console ?
wsmouse* at pms? mux 0
@@ -625,11 +625,11 @@
options VIA_C7TEMP
# Intel ICH SMBus controller
-ichsmb* at pci? dev ? function ?
+ichsmb* at pci? dev ? function ?
iic* at ichsmb?
# NVIDIA nForce2/3/4 SMBus controller
-nfsmbc* at pci? dev ? function ?
+nfsmbc* at pci? dev ? function ?
nfsmb* at nfsmbc?
iic* at nfsmb?
@@ -665,7 +665,7 @@
#ug0 at isa? port 0xe0
# VIA VT82C686A/VT8231 Hardware Monitor and Power Management Timer
-#viaenv* at pci? dev ? function ?
+#viaenv* at pci? dev ? function ?
# Serial Presence Detect capable memory modules
#spdmem* at iic? addr 0x50
@@ -810,9 +810,9 @@
hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers
iteide* at pci? dev ? function ? # IT Express IDE controllers
ixpide* at pci? dev ? function ? # ATI IXP IDE controllers
-jmide* at pci? dev ? function ? # JMicron PCI-e PATA/SATA controllers
+jmide* at pci? dev ? function ? # JMicron PCI-e PATA/SATA controllers
ahcisata* at jmide?
-mvsata* at pci? dev ? function ? # Marvell Hercules-I/II
+mvsata* at pci? dev ? function ? # Marvell Hercules-I/II
optiide* at pci? dev ? function ? # Opti IDE controllers
piixide* at pci? dev ? function ? # Intel IDE controllers
pdcide* at pci? dev ? function ? # Promise IDE controllers
@@ -821,7 +821,7 @@
satalink* at pci? dev ? function ? # SiI SATALink controllers
siisata* at pci? dev ? function ? # SiI SteelVine controllers
siside* at pci? dev ? function ? # SiS IDE controllers
-slide* at pci? dev ? function ? # Symphony Labs IDE controllers
+slide* at pci? dev ? function ? # Symphony Labs IDE controllers
svwsata* at pci? dev ? function ? # ServerWorks SATA controllers
stpcide* at pci? dev ? function ? # STMicro STPC IDE controllers
toshide* at pci? dev ? function ? # TOSHIBA PICCOLO controllers
@@ -835,7 +835,7 @@
# CardBus IDE controllers
njata* at cardbus? function ? flags 0x01 # Workbit NinjaATA-32
-siisata* at cardbus? function ? # SiI SteelVine controllers
+siisata* at cardbus? function ? # SiI SteelVine controllers
# ISA ST506, ESDI, and IDE controllers
# Use flags 0x01 if you want to try to use 32bits data I/O (the driver will
@@ -908,7 +908,7 @@
ath* at pci? dev ? function ? # Atheros 5210/5211/5212 802.11
atw* at pci? dev ? function ? # ADMtek ADM8211 (802.11)
bce* at pci? dev ? function ? # Broadcom 4401 10/100 Ethernet
-bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet
+bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet
bnx* at pci? dev ? function ? # Broadcom NetXtremeII gigabit Ethernet
dge* at pci? dev ? function ? # Intel 82597 10GbE LR
en* at pci? dev ? function ? # ENI/Adaptec ATM
@@ -1102,7 +1102,7 @@
uhub* at uhub? port ?
# USB HID device
-uhidev* at uhub? port ? configuration ? interface ?
+uhidev* at uhub? port ? configuration ? interface ?
# USB Mice
ums* at uhidev? reportid ?
@@ -1117,7 +1117,7 @@
wskbd* at ukbd? console ? mux 1
# USB serial adapter
-ucycom* at uhidev? reportid ?
+ucycom* at uhidev? reportid ?
# USB Generic HID devices
uhid* at uhidev? reportid ?
@@ -1130,7 +1130,7 @@
ulpt* at uhub? port ? configuration ? interface ?
# USB Modem
-umodem* at uhub? port ? configuration ?
+umodem* at uhub? port ? configuration ?
ucom* at umodem?
# Huawei E220 3G/HSDPA modem
@@ -1142,7 +1142,7 @@
wd* at umass?
# USB audio
-uaudio* at uhub? port ? configuration ?
+uaudio* at uhub? port ? configuration ?
# USB MIDI
umidi* at uhub? port ? configuration ?
@@ -1181,7 +1181,7 @@
ubsa* at uhub? port ? # Belkin serial adapter
ucom* at ubsa? portno ?
-uchcom* at uhub? port ? # WinChipHead CH341/CH340 serial adapter
+uchcom* at uhub? port ? # WinChipHead CH341/CH340 serial adapter
ucom* at uchcom? portno ?
uftdi* at uhub? port ? # FTDI FT8U100AX serial adapter
@@ -1203,13 +1203,13 @@
ucom* at uvscom? portno ?
# RIM BlackBerry
-uberry* at uhub? port ?
+uberry* at uhub? port ?
# Diamond Multimedia Rio 500
urio* at uhub? port ?
# USB Handspring Visor
-uvisor* at uhub? port ?
+uvisor* at uhub? port ?
ucom* at uvisor?
# Kyocera AIR-EDGE PHONE
@@ -1223,10 +1223,10 @@
usscanner* at uhub? port ?
# Topfield TF5000PVR range of DVB recorders
-utoppy* at uhub? port ?
+utoppy* at uhub? port ?
# y...@p firmware loader
-uyap* at uhub? port ?
+uyap* at uhub? port ?
# D-Link DSB-R100 USB radio
udsbr* at uhub? port ?
@@ -1240,21 +1240,21 @@
ucom* at u3g?
# USB generic serial port (e.g., data over cellular)
-ugensa* at uhub? port ?
+ugensa* at uhub? port ?
ucom* at ugensa?
# IrDA and Consumer Ir devices
# Toshiba Oboe
-oboe* at pci? dev ? function ?
+oboe* at pci? dev ? function ?
irframe* at oboe?
# PCI IEEE1394 controllers
-fwohci* at pci? dev ? function ? # IEEE1394 Open Host Controller
+fwohci* at pci? dev ? function ? # IEEE1394 Open Host Controller
# CardBus IEEE1394 controllers
-fwohci* at cardbus? function ? # IEEE1394 Open Host Controller
+fwohci* at cardbus? function ? # IEEE1394 Open Host Controller
ieee1394if* at fwohci?
fwip* at ieee1394if? # IP over IEEE1394
@@ -1264,8 +1264,8 @@
# SD/MMC/SDIO Controller and Device support
# SD/MMC controller
-sdhc* at pci? # SD Host Controller
-sdmmc* at sdhc? # SD/MMC bus
+sdhc* at pci? # SD Host Controller
+sdmmc* at sdhc? # SD/MMC bus
ld* at sdmmc?
@@ -1278,7 +1278,7 @@
auixp* at pci? dev ? function ? # ATI IXP AC'97 Audio
autri* at pci? dev ? function ? # Trident 4DWAVE based AC'97 Audio
auvia* at pci? dev ? function ? # VIA VT82C686A integrated AC'97 Audio
-azalia* at pci? dev ? function ? # High Definition Audio
+azalia* at pci? dev ? function ? # High Definition Audio
clcs* at pci? dev ? function ? # Cirrus Logic CS4280
clct* at pci? dev ? function ? # Cirrus Logic CS4281
cmpci* at pci? dev ? function ? # C-Media CMI8338/8738
@@ -1349,15 +1349,15 @@
# FM-Radio devices
# ISA radio devices
-#az0 at isa? port 0x350 # Aztech/PackardBell FM Radio Card
+#az0 at isa? port 0x350 # Aztech/PackardBell FM Radio Card
#az1 at isa? port 0x358
-#rt0 at isa? port 0x20c # AIMS Lab Radiotrack & compatible
+#rt0 at isa? port 0x20c # AIMS Lab Radiotrack & compatible
#rt1 at isa? port 0x284
#rt2 at isa? port 0x30c
#rt3 at isa? port 0x384
-#rtii0 at isa? port 0x20c # AIMS Lab Radiotrack II FM Radio Card
+#rtii0 at isa? port 0x20c # AIMS Lab Radiotrack II FM Radio Card
#rtii1 at isa? port 0x30c
-#sf2r0 at isa? port 0x384 # SoundForte RadioLink SF16-FMR2 FM Radio Card
+#sf2r0 at isa? port 0x384 # SoundForte RadioLink SF16-FMR2 FM Radio Card
# PCI radio devices
#gtp* at pci? dev ? function ? # Guillemot Maxi Radio FM 2000 Radio Card
@@ -1372,7 +1372,7 @@
# Video capture devices
-pseye* at uhub? # Sony PLAYSTATION(R) Eye webcam
+pseye* at uhub? # Sony PLAYSTATION(R) Eye webcam
uvideo* at uhub? # USB Video Class capture devices
video* at videobus?
@@ -1380,8 +1380,8 @@
# TV cards
# Brooktree 848/849/878/879 based TV cards
-bktr* at pci? dev ? function ?
-radio* at bktr?
+bktr* at pci? dev ? function ?
+radio* at bktr?
# Bluetooth Controller and Device support
@@ -1472,8 +1472,8 @@
# Pseudo-Devices
-pseudo-device crypto # /dev/crypto device
-pseudo-device swcrypto # software crypto implementation
+pseudo-device crypto # /dev/crypto device
+pseudo-device swcrypto # software crypto implementation
# disk/mass storage pseudo-devices
pseudo-device bio # RAID control device driver
Index: src/sys/arch/i386/conf/GENERIC_ISDN
diff -u src/sys/arch/i386/conf/GENERIC_ISDN:1.15 src/sys/arch/i386/conf/GENERIC_ISDN:1.16
--- src/sys/arch/i386/conf/GENERIC_ISDN:1.15 Sun Dec 11 12:17:40 2005
+++ src/sys/arch/i386/conf/GENERIC_ISDN Sun Jan 3 03:53:34 2010
@@ -1,8 +1,8 @@
-# $NetBSD: GENERIC_ISDN,v 1.15 2005/12/11 12:17:40 christos Exp $
+# $NetBSD: GENERIC_ISDN,v 1.16 2010/01/03 03:53:34 dholland Exp $
#
# GENERIC kernel with all supported ISDN devices and drivers
-include "arch/i386/conf/GENERIC"
+include "arch/i386/conf/GENERIC"
#---------------------------------------------------------------------
# Various ISDN board drivers:
@@ -11,26 +11,26 @@
#
# Teles S0/8 or Niccy 1008
options ISICISA_TEL_S0_8
-# isic0 at isa? iomem 0xd0000 irq 2
+#isic0 at isa? iomem 0xd0000 irq 2
# Teles S0/16 or Creatix ISDN-S0 or Niccy 1016
options ISICISA_TEL_S0_16
-# isic0 at isa? port 0xd80 iomem 0xd0000 irq 9
+#isic0 at isa? port 0xd80 iomem 0xd0000 irq 9
# Teles S0/16.3
options ISICISA_TEL_S0_16_3
-# isic0 at isa? port 0xd80 irq 12
+#isic0 at isa? port 0xd80 irq 12
# AVM A1 or AVM Fritz!Card
options ISICISA_AVM_A1
-isic0 at isa? port 0x340 irq 10
+isic0 at isa? port 0x340 irq 10
# USRobotics Sportster ISDN TA intern
options ISICISA_USR_STI
-# isic0 at isa? port 0x268 irq 10
+#isic0 at isa? port 0x268 irq 10
# ITK ix1 micro
options ISICISA_ITKIX1
-# isic0 at isa? port 0x398 irq 10
+#isic0 at isa? port 0x398 irq 10
#
# XXX not ready yet:
# Active EICON/Diehl Cards: S, SX, SXn, SCOM or QUADRO
-# daic0 at isa? iomem 0xd8000 irq 10
+#daic0 at isa? iomem 0xd8000 irq 10
#
#---------------------------------------------------------------------
# Supported ISA Plug & Play cards:
@@ -44,24 +44,24 @@
options ISICPNP_DYNALINK # Dynalink IS64PH
options ISICPNP_SIEMENS_ISURF2 # Siemens I-Surf
options ISICPNP_ITKIX # ITK IX PnP cards
-isic* at isapnp?
+isic* at isapnp?
#
#---------------------------------------------------------------------
# Supported PCI cards:
#
-isic* at pci?
+isic* at pci?
# Winbond W6692
-iwic* at pci?
+iwic* at pci?
# AVM Fritz!PCI card
-ifpci* at pci?
+ifpci* at pci?
# AVM Fritz!PCI V2 card
-ifritz* at pci?
+ifritz* at pci?
# AVM B1/T1 PCI card
-iavc* at pci?
+iavc* at pci?
#
#---------------------------------------------------------------------
@@ -71,7 +71,7 @@
options ISICPCMCIA_ELSA_ISDNMC # ELSA MicroLink ISDN/MC
options ISICPCMCIA_ELSA_MCALL # ELSA MicroLink MC/all
options ISICPCMCIA_SBSPEEDSTAR2 # Sedlbauer speed star II
-isic* at pcmcia? function ?
+isic* at pcmcia? function ?
#
#---------------------------------------------------------------------
Index: src/sys/arch/i386/conf/GENERIC_PS2TINY
diff -u src/sys/arch/i386/conf/GENERIC_PS2TINY:1.58 src/sys/arch/i386/conf/GENERIC_PS2TINY:1.59
--- src/sys/arch/i386/conf/GENERIC_PS2TINY:1.58 Sun Jan 3 03:50:38 2010
+++ src/sys/arch/i386/conf/GENERIC_PS2TINY Sun Jan 3 03:53:34 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_PS2TINY,v 1.58 2010/01/03 03:50:38 dholland Exp $
+# $NetBSD: GENERIC_PS2TINY,v 1.59 2010/01/03 03:53:34 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,
@@ -70,22 +70,22 @@
makeoptions USE_SSP="no"
# File systems
-file-system FFS # UFS
-#file-system EXT2FS # second extended file system (linux)
-#file-system LFS # log-structured file system
-#file-system MFS # memory file system
-file-system NFS # Network File System client
-#file-system NTFS # Windows/NT file system (experimental)
-file-system CD9660 # ISO 9660 + Rock Ridge file system
-file-system MSDOSFS # MS-DOS file system
-#file-system FDESC # /dev/fd
-file-system KERNFS # /kern
-#file-system NULLFS # loopback file system
-#file-system OVERLAY # overlay file system
-#file-system PROCFS # /proc
-#file-system UMAPFS # NULLFS + uid and gid remapping
-#file-system UNION # union file system
-#file-system CODA # Coda File System; also needs vcoda (below)
+file-system FFS # UFS
+#file-system EXT2FS # second extended file system (linux)
+#file-system LFS # log-structured file system
+#file-system MFS # memory file system
+file-system NFS # Network File System client
+#file-system NTFS # Windows/NT file system (experimental)
+file-system CD9660 # ISO 9660 + Rock Ridge file system
+file-system MSDOSFS # MS-DOS file system
+#file-system FDESC # /dev/fd
+file-system KERNFS # /kern
+#file-system NULLFS # loopback file system
+#file-system OVERLAY # overlay file system
+#file-system PROCFS # /proc
+#file-system UMAPFS # NULLFS + uid and gid remapping
+#file-system UNION # union file system
+#file-system CODA # Coda File System; also needs vcoda (below)
# File system options
options QUOTA # UFS quotas
Index: src/sys/arch/i386/conf/GENERIC_TINY
diff -u src/sys/arch/i386/conf/GENERIC_TINY:1.121 src/sys/arch/i386/conf/GENERIC_TINY:1.122
--- src/sys/arch/i386/conf/GENERIC_TINY:1.121 Sun Jan 3 03:50:38 2010
+++ src/sys/arch/i386/conf/GENERIC_TINY Sun Jan 3 03:53:34 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_TINY,v 1.121 2010/01/03 03:50:38 dholland Exp $
+# $NetBSD: GENERIC_TINY,v 1.122 2010/01/03 03:53:34 dholland Exp $
#
# GENERIC_TINY -- suitable default for 4M machines
# No EISA, PCI, or SCSI.
@@ -86,21 +86,21 @@
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
# File systems
-file-system FFS # UFS
-#file-system EXT2FS # second extended file system (linux)
-#file-system LFS # log-structured file system
-#file-system MFS # memory file system
-file-system NFS # Network File System client
-file-system CD9660 # ISO 9660 + Rock Ridge file system
-file-system MSDOSFS # MS-DOS file system
-#file-system FDESC # /dev/fd
-file-system KERNFS # /kern
-#file-system NULLFS # loopback file system
-#file-system PROCFS # /proc
-#file-system UMAPFS # NULLFS + uid and gid remapping
-#file-system UNION # union file system
-#file-system PTYFS # /dev/pts/N support
-#file-system TMPFS # Efficient memory file-system
+file-system FFS # UFS
+#file-system EXT2FS # second extended file system (linux)
+#file-system LFS # log-structured file system
+#file-system MFS # memory file system
+file-system NFS # Network File System client
+file-system CD9660 # ISO 9660 + Rock Ridge file system
+file-system MSDOSFS # MS-DOS file system
+#file-system FDESC # /dev/fd
+file-system KERNFS # /kern
+#file-system NULLFS # loopback file system
+#file-system PROCFS # /proc
+#file-system UMAPFS # NULLFS + uid and gid remapping
+#file-system UNION # union file system
+#file-system PTYFS # /dev/pts/N support
+#file-system TMPFS # Efficient memory file-system
# File system options
#options QUOTA # UFS quotas
@@ -223,14 +223,14 @@
#isa0 at ichlpcib?
# PCMCIA bus support
-pcmcia* at pcic? controller ? socket ?
+pcmcia* at pcic? controller ? socket ?
# ISA PCMCIA controllers
pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000
pcic1 at isa? port 0x3e2 iomem 0xd4000 iosiz 0x4000
# ISA Plug-and-Play bus support
-#isapnp0 at isa?
+#isapnp0 at isa?
# ISA Plug-and-Play PCMCIA controllers
#pcic* at isapnp?
@@ -243,15 +243,15 @@
# Console Devices
# wscons
-pckbc0 at isa? # PC keyboard controller
-pckbd* at pckbc? # PC keyboard
+pckbc0 at isa? # PC keyboard controller
+pckbd* at pckbc? # PC keyboard
#pms* at pckbc? # PS/2 mouse for wsmouse
vga0 at isa?
#vga* at pci? dev ? function ?
-pcdisplay0 at isa? # CGA, MDA, EGA, HGA
+pcdisplay0 at isa? # CGA, MDA, EGA, HGA
wsdisplay* at vga? console ?
-wsdisplay* at pcdisplay? console ?
-wskbd* at pckbd? console ?
+wsdisplay* at pcdisplay? console ?
+wskbd* at pckbd? console ?
#wsmouse* at pms? mux 0
@@ -502,7 +502,7 @@
#eap* at pci? dev ? function ? # Ensoniq AudioPCI
# ISA Plug-and-Play audio devices
-#guspnp* at isapnp? # Gravis Ultra Sound PnP audio
+#guspnp* at isapnp? # Gravis Ultra Sound PnP audio
#sb* at isapnp? # SoundBlaster-compatible audio
#ym* at isapnp? # Yamaha OPL3-SA[23] audio
Index: src/sys/arch/i386/conf/INSTALL_FLOPPY
diff -u src/sys/arch/i386/conf/INSTALL_FLOPPY:1.7 src/sys/arch/i386/conf/INSTALL_FLOPPY:1.8
--- src/sys/arch/i386/conf/INSTALL_FLOPPY:1.7 Sun Jan 3 03:50:38 2010
+++ src/sys/arch/i386/conf/INSTALL_FLOPPY Sun Jan 3 03:53:34 2010
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_FLOPPY,v 1.7 2010/01/03 03:50:38 dholland Exp $
+# $NetBSD: INSTALL_FLOPPY,v 1.8 2010/01/03 03:53:34 dholland Exp $
#
# INSTALL - Installation kernel.
#
@@ -224,8 +224,8 @@
isa0 at pcib?
# PCMCIA bus support
-pcmcia* at pcic? controller ? socket ?
-pcmcia* at tcic? controller ? socket ?
+pcmcia* at pcic? controller ? socket ?
+pcmcia* at tcic? controller ? socket ?
# ISA PCMCIA controllers
pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000
@@ -237,7 +237,7 @@
pcic0 at pci? dev? function ?
# ISA Plug-and-Play bus support
-isapnp0 at isa?
+isapnp0 at isa?
# ISA Plug-and-Play PCMCIA controllers
pcic* at isapnp?
@@ -278,7 +278,7 @@
# PCMCIA serial interfaces
com* at pcmcia? function ? # Modems and serial cards
-pcmcom* at pcmcia? function ? # PCMCIA multi-port serial cards
+pcmcom* at pcmcia? function ? # PCMCIA multi-port serial cards
com* at pcmcom? slave ? # ...and the slave devices
# ISA serial interfaces
@@ -412,7 +412,7 @@
geodeide* at pci? dev ? function ? # AMD Geode IDE controllers
hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers
iteide* at pci? dev ? function ? # IT Express IDE controllers
-#ixpide* at pci? dev ? function ? # ATI IXP IDE controllers
+#ixpide* at pci? dev ? function ? # ATI IXP IDE controllers
optiide* at pci? dev ? function ? # Opti IDE controllers
piixide* at pci? dev ? function ? # Intel IDE controllers
pdcide* at pci? dev ? function ? # Promise IDE controllers
@@ -420,7 +420,7 @@
rccide* at pci? dev ? function ? # ServerWorks IDE controllers
satalink* at pci? dev ? function ? # SiI SATALink controllers
siside* at pci? dev ? function ? # SiS IDE controllers
-slide* at pci? dev ? function ? # Symphony Labs IDE controllers
+slide* at pci? dev ? function ? # Symphony Labs IDE controllers
#svwsata* at pci? dev ? function ? # ServerWorks SATA controllers
viaide* at pci? dev ? function ? # VIA/AMD/Nvidia IDE controllers
stpcide* at pci? dev ? function ? # STMicro STPC IDE controllers
@@ -605,23 +605,23 @@
exphy* at mii? phy ? # 3Com internal PHYs
glxtphy* at mii? phy ? # Level One LXT-1000 PHYs
gphyter* at mii? phy ? # NS83861 Gig-E PHY
-icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x
+icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x
igphy* at mii? phy ? # Intel IGP01E1000
ikphy* at mii? phy ? # Intel 82563 PHYs
inphy* at mii? phy ? # Intel 82555 PHYs
iophy* at mii? phy ? # Intel 82553 PHYs
-lxtphy* at mii? phy ? # Level One LXT-970 PHYs
-makphy* at mii? phy ? # Marvell Semiconductor 88E1000 PHYs
+lxtphy* at mii? phy ? # Level One LXT-970 PHYs
+makphy* at mii? phy ? # Marvell Semiconductor 88E1000 PHYs
nsphy* at mii? phy ? # NS83840 PHYs
-nsphyter* at mii? phy ? # NS83843 PHYs
+nsphyter* at mii? phy ? # NS83843 PHYs
pnaphy* at mii? phy ? # generic HomePNA PHYs
qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs
-rgephy* at mii? phy ? # Realtek 8169S/8110S internal PHYs
+rgephy* at mii? phy ? # Realtek 8169S/8110S internal PHYs
rlphy* at mii? phy ? # Realtek 8139/8201L PHYs
sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
tlphy* at mii? phy ? # ThunderLAN PHYs
tqphy* at mii? phy ? # TDK Semiconductor PHYs
-urlphy* at mii? phy ? # Realtek RTL8150L internal PHYs
+urlphy* at mii? phy ? # Realtek RTL8150L internal PHYs
ukphy* at mii? phy ? # generic unknown PHYs
# USB Controller and Devices
@@ -641,7 +641,7 @@
uhub* at uhub? port ?
# USB HID device
-uhidev* at uhub? port ? configuration ? interface ?
+uhidev* at uhub? port ? configuration ? interface ?
# USB Mice
#ums* at uhidev? reportid ?
@@ -652,7 +652,7 @@
wskbd* at ukbd? console ?
# USB serial adapter
-#ucycom* at uhidev? reportid ?
+#ucycom* at uhidev? reportid ?
# USB Generic HID devices
#uhid* at uhidev? reportid ?
@@ -685,7 +685,7 @@
#sv* at pci? dev ? function ? # S3 SonicVibes
# ISA Plug-and-Play audio devices
-#guspnp* at isapnp? # Gravis Ultra Sound PnP audio
+#guspnp* at isapnp? # Gravis Ultra Sound PnP audio
#sb* at isapnp? # SoundBlaster-compatible audio
# ISA audio devices
Index: src/sys/arch/i386/conf/INSTALL_PS2
diff -u src/sys/arch/i386/conf/INSTALL_PS2:1.11 src/sys/arch/i386/conf/INSTALL_PS2:1.12
--- src/sys/arch/i386/conf/INSTALL_PS2:1.11 Fri Feb 6 18:50:27 2009
+++ src/sys/arch/i386/conf/INSTALL_PS2 Sun Jan 3 03:53:34 2010
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_PS2,v 1.11 2009/02/06 18:50:27 jym Exp $
+# $NetBSD: INSTALL_PS2,v 1.12 2010/01/03 03:53:34 dholland Exp $
#
# INSTALL_PS2 - PS/2 Installation kernel.
#
@@ -16,4 +16,4 @@
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
# File systems
-file-system MFS # memory file system
+file-system MFS # memory file system
Index: src/sys/arch/i386/conf/INSTALL_XEN3_DOMU
diff -u src/sys/arch/i386/conf/INSTALL_XEN3_DOMU:1.11 src/sys/arch/i386/conf/INSTALL_XEN3_DOMU:1.12
--- src/sys/arch/i386/conf/INSTALL_XEN3_DOMU:1.11 Fri Feb 6 18:50:27 2009
+++ src/sys/arch/i386/conf/INSTALL_XEN3_DOMU Sun Jan 3 03:53:34 2010
@@ -1,13 +1,13 @@
-# $NetBSD: INSTALL_XEN3_DOMU,v 1.11 2009/02/06 18:50:27 jym Exp $
+# $NetBSD: INSTALL_XEN3_DOMU,v 1.12 2010/01/03 03:53:34 dholland Exp $
#
# INSTALL_XEN3_DOMU - Installation kernel for Xen 3/DomU.
#
# This kernel is derived from XEN3_DOMU with additional memory disk
# options.
-include "arch/i386/conf/XEN3_DOMU"
+include "arch/i386/conf/XEN3_DOMU"
-#ident "INSTALL-$Revision: 1.11 $"
+#ident "INSTALL-$Revision: 1.12 $"
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # force root on memory disk
Index: src/sys/arch/i386/conf/INSTALL_TINY
diff -u src/sys/arch/i386/conf/INSTALL_TINY:1.127 src/sys/arch/i386/conf/INSTALL_TINY:1.128
--- src/sys/arch/i386/conf/INSTALL_TINY:1.127 Sun Jan 3 03:50:38 2010
+++ src/sys/arch/i386/conf/INSTALL_TINY Sun Jan 3 03:53:34 2010
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_TINY,v 1.127 2010/01/03 03:50:38 dholland Exp $
+# $NetBSD: INSTALL_TINY,v 1.128 2010/01/03 03:53:34 dholland Exp $
#
# This kernel should be derived from INSTALL (which is derived
# from GENERIC) with some features commented out.
@@ -90,21 +90,21 @@
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
# File systems
-file-system FFS # UFS
-#file-system EXT2FS # second extended file system (linux)
-#file-system LFS # log-structured file system
-#file-system MFS # memory file system
-file-system NFS # Network File System client
-file-system CD9660 # ISO 9660 + Rock Ridge file system
-file-system MSDOSFS # MS-DOS file system
-#file-system FDESC # /dev/fd
-#file-system KERNFS # /kern
-#file-system NULLFS # loopback file system
-#file-system PROCFS # /proc
-#file-system UMAPFS # NULLFS + uid and gid remapping
-#file-system UNION # union file system
-#file-system PTYFS # /dev/pts/N support
-#file-system TMPFS # Efficient memory file-system
+file-system FFS # UFS
+#file-system EXT2FS # second extended file system (linux)
+#file-system LFS # log-structured file system
+#file-system MFS # memory file system
+file-system NFS # Network File System client
+file-system CD9660 # ISO 9660 + Rock Ridge file system
+file-system MSDOSFS # MS-DOS file system
+#file-system FDESC # /dev/fd
+#file-system KERNFS # /kern
+#file-system NULLFS # loopback file system
+#file-system PROCFS # /proc
+#file-system UMAPFS # NULLFS + uid and gid remapping
+#file-system UNION # union file system
+#file-system PTYFS # /dev/pts/N support
+#file-system TMPFS # Efficient memory file-system
# Filesystem options
#options QUOTA # UFS quotas
@@ -222,7 +222,7 @@
#isa0 at pcib?
# ISA Plug-and-Play bus support
-#isapnp0 at isa?
+#isapnp0 at isa?
# Coprocessor Support
@@ -233,11 +233,11 @@
# Console Devices
# wscons
-pckbc0 at isa? # PC keyboard controller
-pckbd* at pckbc? # PC keyboard
+pckbc0 at isa? # PC keyboard controller
+pckbd* at pckbc? # PC keyboard
pcdisplay0 at isa? # CGA, MDA, EGA, HGA
wsdisplay* at pcdisplay? console ?
-wskbd* at pckbd? console ?
+wskbd* at pckbd? console ?
#wsmouse* at pms? mux 0
# Serial Devices
@@ -357,7 +357,7 @@
# IDE and related devices
# PCMCIA IDE controllers
-wdc* at pcmcia? function ?
+wdc* at pcmcia? function ?
# ST506, ESDI, and ISA IDE controllers
# Use flags 0x01 if you want to try to use 32bits data I/O (the driver will
@@ -461,7 +461,7 @@
# Audio Devices
# ISA Plug-and-Play audio devices
-#guspnp* at isapnp? # Gravis Ultra Sound PnP audio
+#guspnp* at isapnp? # Gravis Ultra Sound PnP audio
#sb* at isapnp? # SoundBlaster-compatible audio
# ISA audio devices
Index: src/sys/arch/i386/conf/INSTALL_XEN3PAE_DOMU
diff -u src/sys/arch/i386/conf/INSTALL_XEN3PAE_DOMU:1.4 src/sys/arch/i386/conf/INSTALL_XEN3PAE_DOMU:1.5
--- src/sys/arch/i386/conf/INSTALL_XEN3PAE_DOMU:1.4 Fri Feb 6 18:50:27 2009
+++ src/sys/arch/i386/conf/INSTALL_XEN3PAE_DOMU Sun Jan 3 03:53:34 2010
@@ -1,13 +1,13 @@
-# $NetBSD: INSTALL_XEN3PAE_DOMU,v 1.4 2009/02/06 18:50:27 jym Exp $
+# $NetBSD: INSTALL_XEN3PAE_DOMU,v 1.5 2010/01/03 03:53:34 dholland Exp $
#
# INSTALL_XEN3PAE_DOMU - Installation kernel for Xen 3/DomU with PAE.
#
# This kernel is derived from XEN3PAE_DOMU with additional memory disk
# options.
-include "arch/i386/conf/XEN3PAE_DOMU"
+include "arch/i386/conf/XEN3PAE_DOMU"
-#ident "INSTALL-$Revision: 1.4 $"
+#ident "INSTALL-$Revision: 1.5 $"
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # force root on memory disk
Index: src/sys/arch/i386/conf/NET4501
diff -u src/sys/arch/i386/conf/NET4501:1.70 src/sys/arch/i386/conf/NET4501:1.71
--- src/sys/arch/i386/conf/NET4501:1.70 Sun Jan 3 03:50:38 2010
+++ src/sys/arch/i386/conf/NET4501 Sun Jan 3 03:53:34 2010
@@ -1,4 +1,4 @@
-# $NetBSD: NET4501,v 1.70 2010/01/03 03:50:38 dholland Exp $
+# $NetBSD: NET4501,v 1.71 2010/01/03 03:53:34 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.70 $"
+#ident "NET4501-$Revision: 1.71 $"
maxusers 32 # estimated number of users
@@ -103,24 +103,24 @@
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
# File systems
-file-system FFS # UFS
-#file-system EXT2FS # second extended file system (linux)
-#file-system LFS # log-structured file system
-file-system MFS # memory file system
-file-system NFS # Network File System client
-#file-system NTFS # Windows/NT file system (experimental)
-#file-system CD9660 # ISO 9660 + Rock Ridge file system
-#file-system MSDOSFS # MS-DOS file system
-file-system FDESC # /dev/fd
-file-system KERNFS # /kern
-#file-system NULLFS # loopback file system
-#file-system OVERLAY # overlay file system
-file-system PROCFS # /proc
-#file-system UMAPFS # NULLFS + uid and gid remapping
-#file-system UNION # union file system
-#file-system CODA # Coda File System; also needs vcoda (below)
-file-system PTYFS # /dev/pts/N support
-#file-system TMPFS # Efficient memory file-system
+file-system FFS # UFS
+#file-system EXT2FS # second extended file system (linux)
+#file-system LFS # log-structured file system
+file-system MFS # memory file system
+file-system NFS # Network File System client
+#file-system NTFS # Windows/NT file system (experimental)
+#file-system CD9660 # ISO 9660 + Rock Ridge file system
+#file-system MSDOSFS # MS-DOS file system
+file-system FDESC # /dev/fd
+file-system KERNFS # /kern
+#file-system NULLFS # loopback file system
+#file-system OVERLAY # overlay file system
+file-system PROCFS # /proc
+#file-system UMAPFS # NULLFS + uid and gid remapping
+#file-system UNION # union file system
+#file-system CODA # Coda File System; also needs vcoda (below)
+file-system PTYFS # /dev/pts/N support
+#file-system TMPFS # Efficient memory file-system
# File system options
#options QUOTA # UFS quotas
@@ -184,7 +184,7 @@
#options PCIINTR_DEBUG # super-verbose PCI interrupt fixup
# PCI bridges
-elansc* at mainbus? bus ? # Elan SC520 System Controller
+elansc* at mainbus? bus ? # Elan SC520 System Controller
#elanpar* at elansc? # Programmable Address Regions
#elanpex* at elansc? # PCI Exception Instrumentation
gpio* at elansc?
@@ -223,7 +223,7 @@
# IDE and related devices
# ATA (IDE) bus support
-atabus* at ata?
+atabus* at ata?
# ISA ST506, ESDI, and IDE controllers
# Use flags 0x01 if you want to try to use 32bits data I/O (the driver will
@@ -261,7 +261,7 @@
wi* at pcmcia? function ? # Lucent/Intersil WaveLAN/IEEE (802.11)
# MII/PHY support
-nsphyter* at mii? phy ? # NS83843 PHYs
+nsphyter* at mii? phy ? # NS83843 PHYs
# Pseudo-Devices
Index: src/sys/arch/i386/conf/XBOX
diff -u src/sys/arch/i386/conf/XBOX:1.18 src/sys/arch/i386/conf/XBOX:1.19
--- src/sys/arch/i386/conf/XBOX:1.18 Sun Jan 3 03:50:38 2010
+++ src/sys/arch/i386/conf/XBOX Sun Jan 3 03:53:34 2010
@@ -1,4 +1,4 @@
-# $NetBSD: XBOX,v 1.18 2010/01/03 03:50:38 dholland Exp $
+# $NetBSD: XBOX,v 1.19 2010/01/03 03:53:34 dholland Exp $
#
# XBOX -- A basic Microsoft XBox kernel config file.
#
@@ -108,8 +108,8 @@
wsdisplay* at xboxfb? console ?
# XBOX X3LCD console
-#x3lcd0 at isa0
-#x3lcd0 at mainbus?
+#x3lcd0 at isa0
+#x3lcd0 at mainbus?
#wsdisplay* at x3lcd0 console ?
# I2C/SMBus support
@@ -180,7 +180,7 @@
uhub* at uhub? port ?
# USB HID device
-uhidev* at uhub? port ? configuration ? interface ?
+uhidev* at uhub? port ? configuration ? interface ?
# USB Mice
ums* at uhidev? reportid ?
@@ -191,7 +191,7 @@
wskbd* at ukbd? console ? mux 1
# USB serial adapter
-ucycom* at uhidev? reportid ?
+ucycom* at uhidev? reportid ?
# USB Generic HID devices
uhid* at uhidev? reportid ?
@@ -200,7 +200,7 @@
ulpt* at uhub? port ? configuration ? interface ?
# USB Modem
-umodem* at uhub? port ? configuration ?
+umodem* at uhub? port ? configuration ?
ucom* at umodem?
# Huawei E220 3G/HSDPA modem
@@ -212,7 +212,7 @@
wd* at umass?
# USB audio
-uaudio* at uhub? port ? configuration ?
+uaudio* at uhub? port ? configuration ?
# USB MIDI
umidi* at uhub? port ? configuration ?
@@ -239,7 +239,7 @@
ucom* at uvscom? portno ?
# Xbox Controller
-xboxcontroller* at uhub? port ? configuration ?
+xboxcontroller* at uhub? port ? configuration ?
wsmouse* at xboxcontroller? mux 0
# USB Generic driver
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.25 src/sys/arch/i386/conf/XEN3_DOM0:1.26
--- src/sys/arch/i386/conf/XEN3_DOM0:1.25 Sun Jan 3 03:50:38 2010
+++ src/sys/arch/i386/conf/XEN3_DOM0 Sun Jan 3 03:53:34 2010
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.25 2010/01/03 03:50:38 dholland Exp $
+# $NetBSD: XEN3_DOM0,v 1.26 2010/01/03 03:53:34 dholland Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -30,14 +30,14 @@
#options USER_LDT # user-settable LDT; used by WINE
# Enhanced SpeedStep Technology in the Pentium M
-options ENHANCED_SPEEDSTEP
-#options EST_FREQ_USERWRITE # any user can set frequency
+options ENHANCED_SPEEDSTEP
+#options EST_FREQ_USERWRITE # any user can set frequency
# AMD PowerNow! K7
-options POWERNOW_K7
+options POWERNOW_K7
# AMD PowerNow! and Cool`n'Quiet technology
-options POWERNOW_K8
+options POWERNOW_K8
#options MTRR # memory-type range register syscall support
@@ -90,7 +90,7 @@
options COMPAT_30 # NetBSD 3.0 compatibility.
options COMPAT_40 # NetBSD 4.0
options COMPAT_43 # 4.3BSD, 386BSD, and BSDI
-options COMPAT_50 # NetBSD 5.0
+options COMPAT_50 # NetBSD 5.0
options COMPAT_386BSD_MBRPART # recognize old partition ID
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
@@ -130,7 +130,7 @@
# File system options
options QUOTA # UFS quotas
#options FFS_EI # FFS Endian Independent support
-options WAPBL # File system journaling support - Experimental
+options WAPBL # File system journaling support - Experimental
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
options NFSSERVER # Network File System server
#options FFS_NO_SNAPSHOT # No FFS snapshot support
@@ -212,7 +212,7 @@
hypervisor* at mainbus? # Xen hypervisor
vcpu* at hypervisor? # Xen virtual CPUs
-xenbus* at hypervisor? # Xen virtual bus
+xenbus* at hypervisor? # Xen virtual bus
npx0 at hypervisor? # x86 math coprocessor
xencons* at hypervisor? # Xen virtual console
@@ -285,7 +285,7 @@
#lm0 at isa? port 0x290 # other common: 0x280, 0x310, 0xc00
# VIA VT82C686A/VT8231 Hardware Monitor and Power Management TImer
-#viaenv* at pci? dev ? function ?
+#viaenv* at pci? dev ? function ?
# PCI network interfaces
@@ -392,8 +392,8 @@
geodeide* at pci? dev ? function ? # AMD Geode IDE controllers
hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers
iteide* at pci? dev ? function ? # IT Express IDE controllers
-ixpide* at pci? dev ? function ? # ATI IXP IDE controllers
-jmide* at pci? dev ? function ? # JMicron PCI-e PATA/SATA controllers
+ixpide* at pci? dev ? function ? # ATI IXP IDE controllers
+jmide* at pci? dev ? function ? # JMicron PCI-e PATA/SATA controllers
ahcisata* at jmide?
optiide* at pci? dev ? function ? # Opti IDE controllers
piixide* at pci? dev ? function ? # Intel IDE controllers
@@ -472,7 +472,7 @@
# RAID controllers and devices
aac* at pci? dev ? function ? # Adaptec AAC family
amr* at pci? dev ? function ? # AMI/LSI Logic MegaRAID
-arcmsr* at pci? dev ? function ? # Areca SATA RAID controllers
+arcmsr* at pci? dev ? function ? # Areca SATA RAID controllers
cac* at pci? dev ? function ? # Compaq PCI array controllers
ciss* at pci? dev ? function ? # HP Smart Array controllers
icp* at pci? dev ? function ? # ICP-Vortex GDT & Intel RAID
@@ -537,7 +537,7 @@
wskbd* at ukbd? console ? mux 1
# USB serial adapter
-ucycom* at uhidev? reportid ?
+ucycom* at uhidev? reportid ?
# USB Generic HID devices
uhid* at uhidev? reportid ?
@@ -633,10 +633,10 @@
ugen* at uhub? port ?
# PCI IEEE1394 controllers
-fwohci* at pci? dev ? function ? # IEEE1394 Open Host Controller
+fwohci* at pci? dev ? function ? # IEEE1394 Open Host Controller
# CardBus IEEE1394 controllers
-#fwohci* at cardbus? function ? # IEEE1394 Open Host Controller
+#fwohci* at cardbus? function ? # IEEE1394 Open Host Controller
ieee1394if* at fwohci?
fwip* at ieee1394if? # IP over IEEE1394
@@ -822,7 +822,7 @@
#options PCI_BUS_FIXUP # fixup PCI bus numbering
#options PCI_INTR_FIXUP # fixup PCI interrupt routing
-ioapic* at mainbus? apid ?
+ioapic* at mainbus? apid ?
# ACPI devices
acpiacad* at acpi? # ACPI AC Adapter
Index: src/sys/arch/i386/conf/XEN3_DOMU
diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.21 src/sys/arch/i386/conf/XEN3_DOMU:1.22
--- src/sys/arch/i386/conf/XEN3_DOMU:1.21 Sun Jan 3 03:50:38 2010
+++ src/sys/arch/i386/conf/XEN3_DOMU Sun Jan 3 03:53:34 2010
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.21 2010/01/03 03:50:38 dholland Exp $
+# $NetBSD: XEN3_DOMU,v 1.22 2010/01/03 03:53:34 dholland Exp $
include "arch/xen/conf/std.xen"
@@ -70,7 +70,7 @@
options COMPAT_30 # NetBSD 3.0 compatibility.
options COMPAT_40 # NetBSD 4.0
options COMPAT_43 # 4.3BSD, 386BSD, and BSDI
-options COMPAT_50 # NetBSD 5.0
+options COMPAT_50 # NetBSD 5.0
options COMPAT_386BSD_MBRPART # recognize old partition ID
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
@@ -111,7 +111,7 @@
# File system options
options QUOTA # UFS quotas
#options FFS_EI # FFS Endian Independent support
-options WAPBL # File system journaling support - Experimental
+options WAPBL # File system journaling support - Experimental
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
options NFSSERVER # Network File System server
#options FFS_NO_SNAPSHOT # No FFS snapshot support
@@ -179,8 +179,8 @@
xencons* at hypervisor? # Xen virtual console
-xenbus* at hypervisor? # Xen virtual bus
-xennet* at xenbus? # Xen virtual network interface
+xenbus* at hypervisor? # Xen virtual bus
+xennet* at xenbus? # Xen virtual network interface
xbd* at xenbus? # Xen virtual block device
cinclude "arch/i386/conf/GENERIC.local"
