diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2002-07-24 00:22:27 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2002-07-24 00:22:27 +0000 |
| commit | 2480400d07ac92c628453a126c26547554aa417f (patch) | |
| tree | b7a98a044ced6f41930e17c28daefd6760259431 /sys/arch/macppc | |
| parent | e253f541612124dc41f2391eaf48140df6a4c011 (diff) | |
why do i always have to mop up
Diffstat (limited to 'sys/arch/macppc')
| -rw-r--r-- | sys/arch/macppc/conf/GENERIC | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC index a396620abcc..b5720a733dd 100644 --- a/sys/arch/macppc/conf/GENERIC +++ b/sys/arch/macppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.29 2002/07/23 17:53:24 drahn Exp $g +# $OpenBSD: GENERIC,v 1.30 2002/07/24 00:22:26 deraadt Exp $g # # PPC GENERIC config file # @@ -28,9 +28,6 @@ include "../../../conf/GENERIC" config bsd swap generic -# -# Now the Machine specification -# mainbus0 at root cpu* at mainbus0 @@ -165,20 +162,20 @@ umass* at uhub? port ? configuration ? # USB Mass Storage devices scsibus* at umass? kue* at uhub? port ? # Kawasaki KL5KUSB101B aue* at uhub? port ? # USB EtherNet -uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter -ucom* at uplcom? portno ? +uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial +ucom* at uplcom? portno ? # CardBus bus support -cardbus* at cardslot? -pcmcia* at cardslot? -cbb* at pci? dev ? function ? -cardslot* at cbb? +cardbus* at cardslot? +pcmcia* at cardslot? +cbb* at pci? dev ? function ? +cardslot* at cbb? wi* at pcmcia? function ? # WaveLAN IEEE 802.11DS #dc* at cardbus? dev ? function ? # 21143, "tulip" clone ethernet #fxp* at cardbus? dev ? function ? # Intel PRO/100 ethernet #xl* at cardbus? dev ? function ? # 3C575/3C656 ethernet #rl* at cardbus? dev ? function ? # RealTek 81[23]9 ethernet -#wdc* at pcmcia? function ? +#wdc* at pcmcia? function ? wsdisplay* at vgafb? wskbd* at ukbd? console ? mux 1 @@ -190,4 +187,4 @@ ch* at scsibus? target ? lun ? ss* at scsibus? target ? lun ? uk* at scsibus? target ? lun ? -pseudo-device wsmux 2 # mouse & keyboard multiplexor +pseudo-device wsmux 2 # mouse & keyboard multiplexor |