summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2006-04-30 20:21:54 +0000
committerBrad Smith <brad@cvs.openbsd.org>2006-04-30 20:21:54 +0000
commita965158cce2d4436cb90cff4581d83a85d082508 (patch)
tree18496c841f30ebbab6a2b6c5c66433e985341d11
parentfb19f86b95cfa840e46d651bf8c15f19395d001c (diff)
- Enable fxp and rl@CardBus on GENERIC and RAMDISK
- Enable dc@CardBus on RAMDISK, already in GENERIC - Enable wdc@PCMCIA on RAMDISK, already in GENERIC
-rw-r--r--sys/arch/macppc/conf/GENERIC6
-rw-r--r--sys/arch/macppc/conf/RAMDISK10
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index 58c51de247d..944489dedc0 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.135 2006/04/27 16:10:01 mbalmer Exp $g
+# $OpenBSD: GENERIC,v 1.136 2006/04/30 20:21:53 brad Exp $g
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -285,9 +285,9 @@ ep* at pcmcia? # PCMCIA based 3C5xx ethernet
an* at pcmcia? # Cisco/Aironet
wi* at pcmcia? # WaveLAN IEEE 802.11DS
dc* at cardbus? # 21143, "tulip" clone ethernet
-#fxp* at cardbus? # Intel PRO/100 ethernet
+fxp* at cardbus? # Intel PRO/100 ethernet
xl* at cardbus? # 3C575/3C656 ethernet
-#rl* at cardbus? # RealTek 81[23]9 ethernet
+rl* at cardbus? # RealTek 81[23]9 ethernet
rtw* at cardbus? # Realtek 8180
wdc* at pcmcia?
com* at pcmcia?
diff --git a/sys/arch/macppc/conf/RAMDISK b/sys/arch/macppc/conf/RAMDISK
index 1dfe12eda57..af454202608 100644
--- a/sys/arch/macppc/conf/RAMDISK
+++ b/sys/arch/macppc/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.63 2006/04/05 15:29:48 martin Exp $
+# $OpenBSD: RAMDISK,v 1.64 2006/04/30 20:21:53 brad Exp $
#
# PPC GENERIC config file
#
@@ -188,11 +188,11 @@ pcmcia* at cardslot?
cbb* at pci?
cardslot* at cbb?
wi* at pcmcia? # WaveLAN IEEE 802.11DS
-#dc* at cardbus? # 21143, "tulip" clone ethernet
-#fxp* at cardbus? # Intel PRO/100 ethernet
+dc* at cardbus? # 21143, "tulip" clone ethernet
+fxp* at cardbus? # Intel PRO/100 ethernet
xl* at cardbus? # 3C575/3C656 ethernet
-#rl* at cardbus? # RealTek 81[23]9 ethernet
-#wdc* at pcmcia?
+rl* at cardbus? # RealTek 81[23]9 ethernet
+wdc* at pcmcia?
wsdisplay* at vgafb?
wskbd* at ukbd? mux 1