summaryrefslogtreecommitdiff
path: root/sys/arch/socppc/conf
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2010-03-03 22:19:41 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2010-03-03 22:19:41 +0000
commit4ac85c542ff9a39e043e1ff56f03641c3daea806 (patch)
treef48e1b02dbd30c7871f7314d859cd4bff0062057 /sys/arch/socppc/conf
parentf5f6c972525081c40b412bdaebd524160433bc50 (diff)
Add athn(4).
Diffstat (limited to 'sys/arch/socppc/conf')
-rw-r--r--sys/arch/socppc/conf/GENERIC5
-rw-r--r--sys/arch/socppc/conf/RAMDISK5
2 files changed, 8 insertions, 2 deletions
diff --git a/sys/arch/socppc/conf/GENERIC b/sys/arch/socppc/conf/GENERIC
index d48f3fb5333..8b15bf5bc40 100644
--- a/sys/arch/socppc/conf/GENERIC
+++ b/sys/arch/socppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.13 2009/12/23 18:03:07 jasper Exp $
+# $OpenBSD: GENERIC,v 1.14 2010/03/03 22:19:40 kettenis Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -94,5 +94,8 @@ ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY
gentbi* at mii? # Generic 1000BASE-X ten-bit PHY
ukphy* at mii? # Generic unknown PHY
+# PCI
+athn* at pci? # Atheros AR9k (802.11a/g/n)
+
# mouse & keyboard multiplexor pseudo-devices
pseudo-device wsmux 2
diff --git a/sys/arch/socppc/conf/RAMDISK b/sys/arch/socppc/conf/RAMDISK
index a95558645aa..f1e36c9a70b 100644
--- a/sys/arch/socppc/conf/RAMDISK
+++ b/sys/arch/socppc/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.7 2009/09/12 22:03:11 kettenis Exp $
+# $OpenBSD: RAMDISK,v 1.8 2010/03/03 22:19:40 kettenis Exp $
machine socppc powerpc
@@ -77,6 +77,9 @@ ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY
gentbi* at mii? # Generic 1000BASE-X ten-bit PHY
ukphy* at mii? # Generic unknown PHY
+# PCI
+athn* at pci? # Atheros AR9k (802.11a/g/n)
+
pseudo-device loop 1 # network loopback
pseudo-device bpfilter 1 # packet filter
pseudo-device rd 1 # ram disk