diff options
| -rw-r--r-- | sys/arch/alpha/conf/GENERIC | 6 | ||||
| -rw-r--r-- | sys/arch/alpha/conf/RAMDISKBIG | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/RAMDISK_CD | 4 | ||||
| -rw-r--r-- | sys/arch/cats/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/cats/conf/RAMDISK | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISKC | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISK_CD | 4 | ||||
| -rw-r--r-- | sys/arch/luna88k/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/luna88k/conf/RAMDISK | 4 | ||||
| -rw-r--r-- | sys/arch/macppc/conf/GENERIC | 12 | ||||
| -rw-r--r-- | sys/arch/macppc/conf/RAMDISK | 8 | ||||
| -rw-r--r-- | sys/arch/mvmeppc/conf/GENERIC | 6 | ||||
| -rw-r--r-- | sys/arch/mvmeppc/conf/RAMDISK | 6 | ||||
| -rw-r--r-- | sys/arch/sparc/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/sparc64/conf/RAMDISK | 4 | ||||
| -rw-r--r-- | sys/arch/sparc64/conf/RAMDISKU1 | 4 | ||||
| -rw-r--r-- | sys/arch/sparc64/conf/RAMDISKU5 | 4 | ||||
| -rw-r--r-- | sys/arch/vax/conf/GENERIC | 6 | ||||
| -rw-r--r-- | sys/arch/vax/conf/RAMDISK | 4 |
19 files changed, 48 insertions, 48 deletions
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC index d85fe95422b..8dae350f00d 100644 --- a/sys/arch/alpha/conf/GENERIC +++ b/sys/arch/alpha/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.125 2004/09/16 09:14:02 mickey Exp $ +# $OpenBSD: GENERIC,v 1.126 2004/09/16 09:35:36 deraadt Exp $ # $NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $ machine alpha @@ -114,7 +114,7 @@ tcasic* at mainbus0 tc* at tcasic? # TURBOchannel devices -ioasic* at tc? +ioasic* at tc? mcclock* at ioasic? le* at ioasic? scc0 at ioasic? @@ -299,7 +299,7 @@ wd* at pciide? flags 0x0000 atapiscsi* at wdc? atapiscsi* at pciide? scsibus* at atapiscsi? - + # Audio devices eap* at pci? # Ensoniq AudioPCI S5016 diff --git a/sys/arch/alpha/conf/RAMDISKBIG b/sys/arch/alpha/conf/RAMDISKBIG index fe66420759b..d69f2f98cd2 100644 --- a/sys/arch/alpha/conf/RAMDISKBIG +++ b/sys/arch/alpha/conf/RAMDISKBIG @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKBIG,v 1.40 2004/09/16 09:14:03 mickey Exp $ +# $OpenBSD: RAMDISKBIG,v 1.41 2004/09/16 09:35:36 deraadt Exp $ # $NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $ # # Generic Alpha kernel. Enough to get booted, etc., but not much more. @@ -282,7 +282,7 @@ wd* at pciide? flags 0x0000 #atapiscsi* at wdc? atapiscsi* at pciide? scsibus* at atapiscsi? - + # Workstation Console attachments #wsdisplay* at cfb? #wsdisplay* at sfb? diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD index 32e73acd8a2..4b780ea3537 100644 --- a/sys/arch/amd64/conf/RAMDISK_CD +++ b/sys/arch/amd64/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.17 2004/09/16 09:14:03 mickey Exp $ +# $OpenBSD: RAMDISK_CD,v 1.18 2004/09/16 09:35:36 deraadt Exp $ machine amd64 # architecture, used by config; REQUIRED @@ -80,7 +80,7 @@ uhub* at uhub? # USB Hubs #uaudio* at uhub? # USB Audio #ulpt* at uhub? # USB Printers uhidev* at uhub? -ukbd* at uhidev? +ukbd* at uhidev? wskbd* at ukbd? mux 1 umass* at uhub? # USB Mass Storage devices scsibus* at umass? diff --git a/sys/arch/cats/conf/GENERIC b/sys/arch/cats/conf/GENERIC index 3e96a64d5e6..66d6ab0bd85 100644 --- a/sys/arch/cats/conf/GENERIC +++ b/sys/arch/cats/conf/GENERIC @@ -1,7 +1,7 @@ -# $OpenBSD: GENERIC,v 1.11 2004/09/16 09:14:03 mickey Exp $ +# $OpenBSD: GENERIC,v 1.12 2004/09/16 09:35:36 deraadt Exp $ # # GENERIC machine description file -# +# # This machine description file is used to generate the default OpenBSD # kernel. The generic kernel does not include all options, subsystems # and device drivers, but should be useful for most applications. diff --git a/sys/arch/cats/conf/RAMDISK b/sys/arch/cats/conf/RAMDISK index 1de80ff6d11..c34beb2c00f 100644 --- a/sys/arch/cats/conf/RAMDISK +++ b/sys/arch/cats/conf/RAMDISK @@ -1,8 +1,8 @@ -# $OpenBSD: RAMDISK,v 1.4 2004/09/16 09:14:03 mickey Exp $ +# $OpenBSD: RAMDISK,v 1.5 2004/09/16 09:35:36 deraadt Exp $ # $NetBSD: GENERIC,v 1.27.4.1 2002/08/01 04:18:06 lukem Exp $ # # GENERIC machine description file -# +# # This machine description file is used to generate the default OpenBSD # kernel. The generic kernel does not include all options, subsystems # and device drivers, but should be useful for most applications. diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC index 43d108d5fcf..919b15b4c11 100644 --- a/sys/arch/i386/conf/RAMDISKC +++ b/sys/arch/i386/conf/RAMDISKC @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKC,v 1.41 2004/09/16 09:14:03 mickey Exp $ +# $OpenBSD: RAMDISKC,v 1.42 2004/09/16 09:35:36 deraadt Exp $ machine i386 # architecture, used by config; REQUIRED @@ -75,7 +75,7 @@ pcic2 at isa? port 0x3e4 iomem 0xd4000 iosiz 0x4000 pcic* at isapnp? # PCI PCMCIA controllers -pcic* at pci? dev? +pcic* at pci? dev? # PCMCIA bus support pcmcia* at pcic? diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD index 674ccbb9eec..38c7e97665f 100644 --- a/sys/arch/i386/conf/RAMDISK_CD +++ b/sys/arch/i386/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.80 2004/09/16 09:14:03 mickey Exp $ +# $OpenBSD: RAMDISK_CD,v 1.81 2004/09/16 09:35:36 deraadt Exp $ machine i386 # architecture, used by config; REQUIRED @@ -167,7 +167,7 @@ pccom* at isapnp? bha0 at isa? port 0x330 # BusLogic [57]4X SCSI controllers bha1 at isa? disable port 0x334 # BusLogic [57]4X SCSI controllers bha2 at isa? disable -bha* at pci? +bha* at pci? #bha* at eisa? # XXX eisa still runs in isa-compat scsibus* at bha? aha0 at isa? port 0x330 # Adaptec 154[02] SCSI controllers diff --git a/sys/arch/luna88k/conf/GENERIC b/sys/arch/luna88k/conf/GENERIC index 06e2015bc85..21f40bed6e9 100644 --- a/sys/arch/luna88k/conf/GENERIC +++ b/sys/arch/luna88k/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.5 2004/09/16 09:14:03 mickey Exp $ +# $OpenBSD: GENERIC,v 1.6 2004/09/16 09:35:36 deraadt Exp $ machine luna88k m88k @@ -10,7 +10,7 @@ option "NCPUS=1" # number of CPUs supported (max 4) option M88100 # 88100 support; mandatory # Define this if your processor has the xxx.usr bug (mask C82N) -option ERRATA__XXX_USR +option ERRATA__XXX_USR maxusers 64 diff --git a/sys/arch/luna88k/conf/RAMDISK b/sys/arch/luna88k/conf/RAMDISK index ddb3cd11784..7ea42f40073 100644 --- a/sys/arch/luna88k/conf/RAMDISK +++ b/sys/arch/luna88k/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.4 2004/09/16 09:14:03 mickey Exp $ +# $OpenBSD: RAMDISK,v 1.5 2004/09/16 09:35:36 deraadt Exp $ machine luna88k m88k @@ -12,7 +12,7 @@ option "NCPUS=1" # number of CPUs supported (max 4) option M88100 # 88100 support; mandatory # Define this if your processor has the xxx.usr bug (mask C82N) -option ERRATA__XXX_USR +option ERRATA__XXX_USR maxusers 32 diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC index f6e80f2335e..78147c08d4d 100644 --- a/sys/arch/macppc/conf/GENERIC +++ b/sys/arch/macppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.59 2004/09/16 09:14:03 mickey Exp $g +# $OpenBSD: GENERIC,v 1.60 2004/09/16 09:35:36 deraadt Exp $g # # PPC GENERIC config file # @@ -43,7 +43,7 @@ siop* at pci? fxp* at pci? de* at pci? #vme* at pci? -vgafb0 at pci? # PCI VGA graphics +vgafb0 at pci? # PCI VGA graphics #ep* at pci? # 3Com 3c59x #ne* at pci? # NE2000-compatible Ethernet #adv* at pci? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI @@ -53,7 +53,7 @@ ahc* at pci? # Adaptec 294x, aic78x0 SCSI #pcscp* at pci? # AMD Am53c974 PCscsi-PCI SCSI pciide* at pci? kauaiata* at pci? # Apple ATA 100 -wdc* at kauaiata? +wdc* at kauaiata? macobio0 at pci? gem* at pci? # GMAC ethernet hme* at pci? # HME ethernet @@ -81,8 +81,8 @@ mtdphy* at mii? # Myson MTD972 PHYs sqphy* at mii? # Seeq 8022[013] PHYs #tlphy* at mii? # ThunderLAN PHYs #tqphy* at mii? # TDK Semiconductor PHYs -brgphy* at mii? # Broadcom 10/100/1000 PHYs -bmtphy* at mii? # Broadcom 10/100 PHYs +brgphy* at mii? # Broadcom 10/100/1000 PHYs +bmtphy* at mii? # Broadcom 10/100 PHYs eephy* at mii? # Marvell 88E1000 Gigabit PHYs rgephy* at mii? # Realtek 8169S/8110S PHY ukphy* at mii? # generic unknown PHYs @@ -183,7 +183,7 @@ ucom* at uvisor? uvscom* at uhub? # SUNTAC Slipper U VS-10U serial ucom* at uvscom? ubsa* at uhub? # Belkin serial adapter -ucom* at ubsa? +ucom* at ubsa? uftdi* at uhub? # FTDI FT8U100AX serial adapter ucom* at uftdi? uplcom* at uhub? # I/O DATA USB-RSAQ2 serial adapter diff --git a/sys/arch/macppc/conf/RAMDISK b/sys/arch/macppc/conf/RAMDISK index aca5f6232fa..11891b91a4d 100644 --- a/sys/arch/macppc/conf/RAMDISK +++ b/sys/arch/macppc/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.34 2004/09/16 09:14:03 mickey Exp $ +# $OpenBSD: RAMDISK,v 1.35 2004/09/16 09:35:36 deraadt Exp $ # # PPC GENERIC config file # @@ -47,7 +47,7 @@ siop* at pci? fxp* at pci? de* at pci? #vme* at pci? -vgafb0 at pci? # PCI VGA graphics +vgafb0 at pci? # PCI VGA graphics #ep* at pci? # 3Com 3c59x #ne* at pci? # NE2000-compatible Ethernet #adv* at pci? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI @@ -82,8 +82,8 @@ mtdphy* at mii? # Myson MTD972 PHYs sqphy* at mii? # Seeq 80220/80221/80223 PHYs #tlphy* at mii? # ThunderLAN PHYs #tqphy* at mii? # TDK Semiconductor PHYs -brgphy* at mii? # Broadcom 10/100/1000 PHYs -bmtphy* at mii? # Broadcom 10/100 PHYs +brgphy* at mii? # Broadcom 10/100/1000 PHYs +bmtphy* at mii? # Broadcom 10/100 PHYs eephy* at mii? # Marvell 88E1000 Gigabit PHYs rgephy* at mii? # Realtek 8169S/8110S PHY ukphy* at mii? # generic unknown PHYs diff --git a/sys/arch/mvmeppc/conf/GENERIC b/sys/arch/mvmeppc/conf/GENERIC index 36539f219a8..ee5d659361e 100644 --- a/sys/arch/mvmeppc/conf/GENERIC +++ b/sys/arch/mvmeppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.5 2004/09/16 09:14:03 mickey Exp $ +# $OpenBSD: GENERIC,v 1.6 2004/09/16 09:35:36 deraadt Exp $ # # MVMEPPC GENERIC config file # @@ -44,7 +44,7 @@ de* at pci? #vme* at pci? #pciide* at pci? -# ISA Bus +# ISA Bus isa* at pcib? #pckbc0 at isa? # PC keyboard controller #pckbd* at pckbc? # PC keyboard @@ -77,7 +77,7 @@ scsibus* at siop? #scsibus* at atapiscsi? #### SCSI Bus devices - + sd0 at scsibus? target 0 lun 0 #st* at scsibus? #cd* at scsibus? diff --git a/sys/arch/mvmeppc/conf/RAMDISK b/sys/arch/mvmeppc/conf/RAMDISK index bcec429647a..aa0a7efc1e1 100644 --- a/sys/arch/mvmeppc/conf/RAMDISK +++ b/sys/arch/mvmeppc/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.8 2004/09/16 09:14:03 mickey Exp $ +# $OpenBSD: RAMDISK,v 1.9 2004/09/16 09:35:36 deraadt Exp $ # # MVMEPPC GENERIC config file # @@ -45,7 +45,7 @@ de* at pci? #vme* at pci? #pciide* at pci? -# ISA Bus +# ISA Bus isa* at pcib? #pckbc0 at isa? # PC keyboard controller #pckbd* at pckbc? # PC keyboard @@ -78,7 +78,7 @@ scsibus* at siop? #scsibus* at atapiscsi? #### SCSI Bus devices - + sd0 at scsibus? target 0 lun 0 #st* at scsibus? #cd* at scsibus? diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC index 1c25b83e4ac..b8beb04cf24 100644 --- a/sys/arch/sparc/conf/GENERIC +++ b/sys/arch/sparc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.76 2004/09/16 09:14:04 mickey Exp $ +# $OpenBSD: GENERIC,v 1.77 2004/09/16 09:35:36 deraadt Exp $ # $NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $ # Machine architecture; required by config(8) @@ -111,7 +111,7 @@ spif* at sbus? # spif serial cards stty* at spif? sbpp* at spif? -bpp* at sbus? # parallel port +bpp* at sbus? # parallel port # SUNW,xbox SBus Expansion Subsystem xbox* at sbus? # SBus Expansion box diff --git a/sys/arch/sparc64/conf/RAMDISK b/sys/arch/sparc64/conf/RAMDISK index 00924c4c5ab..043f18c71dd 100644 --- a/sys/arch/sparc64/conf/RAMDISK +++ b/sys/arch/sparc64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.29 2004/09/16 09:14:04 mickey Exp $ +# $OpenBSD: RAMDISK,v 1.30 2004/09/16 09:35:37 deraadt Exp $ # Machine architecture; required by config(8) machine sparc64 @@ -53,7 +53,7 @@ em* at pci? # Intel Pro/1000 ethernet auxio* at ebus? auxio* at sbus? #com* at ebus? -clock* at sbus? # Mostek clock +clock* at sbus? # Mostek clock clock* at ebus? rtc* at ebus? # DS1287/M5819 clock timer* at mainbus0 # Timer chip diff --git a/sys/arch/sparc64/conf/RAMDISKU1 b/sys/arch/sparc64/conf/RAMDISKU1 index 7dda213f906..feecf2b4799 100644 --- a/sys/arch/sparc64/conf/RAMDISKU1 +++ b/sys/arch/sparc64/conf/RAMDISKU1 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKU1,v 1.8 2004/09/16 09:14:04 mickey Exp $ +# $OpenBSD: RAMDISKU1,v 1.9 2004/09/16 09:35:37 deraadt Exp $ # Machine architecture; required by config(8) machine sparc64 @@ -35,7 +35,7 @@ cpu0 at mainbus0 # Bus types found on SPARC systems. sbus0 at mainbus0 # Ultra 1 -clock* at sbus? # Mostek clock +clock* at sbus? # Mostek clock timer* at mainbus0 # Timer chip ## PROM console driver -- if all else fails diff --git a/sys/arch/sparc64/conf/RAMDISKU5 b/sys/arch/sparc64/conf/RAMDISKU5 index 1ef1bf17d78..ccffacd5448 100644 --- a/sys/arch/sparc64/conf/RAMDISKU5 +++ b/sys/arch/sparc64/conf/RAMDISKU5 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKU5,v 1.7 2004/09/16 09:14:04 mickey Exp $ +# $OpenBSD: RAMDISKU5,v 1.8 2004/09/16 09:35:37 deraadt Exp $ # Machine architecture; required by config(8) machine sparc64 @@ -45,7 +45,7 @@ gem* at pci? auxio* at ebus? #com* at ebus? -clock* at ebus? # Mostek clock +clock* at ebus? # Mostek clock ## PROM console driver -- if all else fails pcons0 at mainbus0 # PROM console diff --git a/sys/arch/vax/conf/GENERIC b/sys/arch/vax/conf/GENERIC index f6e207a51c4..82025bc3f7e 100644 --- a/sys/arch/vax/conf/GENERIC +++ b/sys/arch/vax/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.35 2004/09/16 09:14:04 mickey Exp $ +# $OpenBSD: GENERIC,v 1.36 2004/09/16 09:35:37 deraadt Exp $ # $NetBSD: GENERIC,v 1.61 2000/04/19 06:50:36 itojun Exp $ machine vax # machine type; required @@ -24,7 +24,7 @@ option VAX49 # VS 4000/90 option VAX53 # VAX 4000 10X, MicroVAX 3100m9X # Max users on system; this is just a hint -maxusers 8 +maxusers 8 option SCSIVERBOSE # Verbose SCSI errors @@ -47,7 +47,7 @@ mainbus0 at root #abus0 at mainbus0 # Master bus on VAX 8600 #sbi0 at mainbus0 # SBI, master bus on 11/780. #cmi0 at mainbus0 # 11/750 internal bus. -#bi0 at mainbus0 # VAX 8200 +#bi0 at mainbus0 # VAX 8200 vsbus0 at mainbus0 # All VAXstations ibus0 at mainbus0 # All Microvax #nbi0 at mainbus0 # VAX 8800 diff --git a/sys/arch/vax/conf/RAMDISK b/sys/arch/vax/conf/RAMDISK index 700114fb3a2..e0c41187673 100644 --- a/sys/arch/vax/conf/RAMDISK +++ b/sys/arch/vax/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.22 2004/09/16 09:14:04 mickey Exp $ +# $OpenBSD: RAMDISK,v 1.23 2004/09/16 09:35:37 deraadt Exp $ machine vax # machine type @@ -59,7 +59,7 @@ mainbus0 at root #abus0 at mainbus0 # Master bus on VAX 8600 #sbi0 at mainbus0 # SBI, master bus on 11/780. #cmi0 at mainbus0 # 11/750 internal bus. -#bi0 at mainbus0 # VAX 8200 +#bi0 at mainbus0 # VAX 8200 vsbus0 at mainbus0 # All VAXstations ibus0 at mainbus0 # All Microvax #nbi0 at mainbus0 # VAX 8800 |