summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2012-01-06 14:08:20 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2012-01-06 14:08:20 +0000
commita0d3ce1fb6993d9774675d58e95fdc4870f12fb6 (patch)
tree3183b0c2ba628fc8d259eccb62cb13fa47706ff6 /sys
parentf954de300232fae8b174f921e69004f00af54056 (diff)
Attach ath(4) to cardbus and add it to bsd.rd
ok jsg@, kettenis@, deraadt@
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/macppc/conf/GENERIC3
-rw-r--r--sys/arch/macppc/conf/RAMDISK4
2 files changed, 5 insertions, 2 deletions
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index c0b929932b7..9889cc6c8e4 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.213 2011/08/29 20:21:44 drahn Exp $g
+# $OpenBSD: GENERIC,v 1.214 2012/01/06 14:08:19 mpi Exp $g
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -339,6 +339,7 @@ cbb* at pci?
cardslot* at cbb?
ep* at pcmcia? # PCMCIA based 3C5xx ethernet
an* at pcmcia? # Cisco/Aironet
+ath* at cardbus? # Atheros AR5k (802.11a/b/g)
wi* at pcmcia? # WaveLAN IEEE 802.11DS
malo* at pcmcia? # Marvell 88W8385
dc* at cardbus? # 21143, "tulip" clone ethernet
diff --git a/sys/arch/macppc/conf/RAMDISK b/sys/arch/macppc/conf/RAMDISK
index af8ec6632fb..58434ccfbb1 100644
--- a/sys/arch/macppc/conf/RAMDISK
+++ b/sys/arch/macppc/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.91 2011/06/29 20:52:09 matthew Exp $
+# $OpenBSD: RAMDISK,v 1.92 2012/01/06 14:08:19 mpi Exp $
#
# PPC GENERIC config file
#
@@ -85,6 +85,7 @@ sk* at skc? # each port of above
mskc* at pci? # Marvell Yukon-2
msk* at mskc? # each port of above
an* at pci? # Cisco/Aironet 802.11DS
+ath* at pci? # Atheros AR5k (802.11a/b/g)
wi* at pci? # WaveLAN IEEE 802.11DS
vr* at pci? # VIA Rhine ethernet
pcn* at pci? # AMD PCnet-PCI Ethernet
@@ -194,6 +195,7 @@ cardbus* at cardslot?
pcmcia* at cardslot?
cbb* at pci?
cardslot* at cbb?
+ath* at cardbus? # Atheros AR5k (802.11a/b/g)
wi* at pcmcia? # WaveLAN IEEE 802.11DS
dc* at cardbus? # 21143, "tulip" clone ethernet
fxp* at cardbus? # Intel PRO/100 ethernet