summaryrefslogtreecommitdiff
path: root/sys/arch/macppc/conf
diff options
context:
space:
mode:
authorDale Rahn <drahn@cvs.openbsd.org>2002-10-07 05:39:49 +0000
committerDale Rahn <drahn@cvs.openbsd.org>2002-10-07 05:39:49 +0000
commit378671f9f69d0e1b7b2d9c443584f084bbae7804 (patch)
tree8ed88f12d4b5c09fabe5b6f8339f8a81d4aeda3c /sys/arch/macppc/conf
parentc0af872518bb1ede0a1ebd3b2dbb9bfc6bb4948c (diff)
Improved workaround for cardbus support on macppc. This allows mappings to
be put in the cardbus register which really work instead of crashing the machine. if_dc @cardbus now works, xl@cardbus will configure, but does not work properly (endian?) wdc should work fine, but has not been tested recently.
Diffstat (limited to 'sys/arch/macppc/conf')
-rw-r--r--sys/arch/macppc/conf/GENERIC7
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index 0d92da4d9eb..fc20520a28d 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.32 2002/09/24 19:08:14 nate Exp $g
+# $OpenBSD: GENERIC,v 1.33 2002/10/07 05:39:48 drahn Exp $g
#
# PPC GENERIC config file
#
@@ -58,6 +58,7 @@ macobio0 at pci? dev ? function ?
gem* at pci? dev ? function ? # GMAC ethernet
hme* at pci? dev ? function ? # HME ethernet
dc* at pci? dev ? function ? # DEC Tulip 21143 clones
+#xl* at pci? dev ? function ? # 3C9xx ethernet
em* at pci? dev ? function ? # Intel Pro/1000 ethernet
an* at pci? dev ? function ? # Cisco/Aironet
wi* at pci? dev ? function ? # WaveLAN IEEE 802.11DS
@@ -171,11 +172,11 @@ 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
+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