summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/amd64/conf/GENERIC3
-rw-r--r--sys/arch/amd64/conf/RAMDISK3
-rw-r--r--sys/arch/amd64/conf/RAMDISK_CD3
-rw-r--r--sys/arch/i386/conf/GENERIC3
-rw-r--r--sys/arch/i386/conf/RAMDISK3
-rw-r--r--sys/arch/i386/conf/RAMDISKB3
-rw-r--r--sys/arch/i386/conf/RAMDISKC3
-rw-r--r--sys/arch/i386/conf/RAMDISK_CD3
8 files changed, 8 insertions, 16 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 8f518a4b0d7..38ef9a27fbc 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.343 2013/08/12 04:11:52 jsg Exp $
+# $OpenBSD: GENERIC,v 1.344 2013/08/13 16:26:21 mikeb Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -472,7 +472,6 @@ wi* at pcmcia? # WaveLAN IEEE 802.11DS
an* at pci? # Aironet IEEE 802.11DS
an* at pcmcia? # Aironet IEEE 802.11DS
cnw* at pcmcia? # Xircom Netwave
-ray* at pcmcia? # Raylink Aviator2.4/Pro 802.11FH
iwi* at pci? # Intel PRO/Wireless 2200BG/2915ABG
wpi* at pci? # Intel PRO/Wireless 3945ABG
iwn* at pci? # Intel WiFi Link 4965/5000/1000/6000
diff --git a/sys/arch/amd64/conf/RAMDISK b/sys/arch/amd64/conf/RAMDISK
index 363eaa0ec34..cb86616d6da 100644
--- a/sys/arch/amd64/conf/RAMDISK
+++ b/sys/arch/amd64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.55 2012/03/15 20:06:02 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.56 2013/08/13 16:26:22 mikeb Exp $
machine amd64 # architecture, used by config; REQUIRED
@@ -217,7 +217,6 @@ nfe* at pci? # NVIDIA nForce Ethernet
#wi* at pcmcia? # WaveLAN IEEE 802.11DS
#an* at pcmcia? # Aironet IEEE 802.11DS
#cnw* at pcmcia? # Xircom Netwave
-#ray* at pcmcia? # Raylink Aviator2.4/Pro 802.11FH
# Media Independent Interface (mii) drivers
#exphy* at mii? # 3Com internal PHYs
diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD
index 350b9d03b58..401481ef28a 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.125 2013/04/05 05:45:09 brad Exp $
+# $OpenBSD: RAMDISK_CD,v 1.126 2013/08/13 16:26:22 mikeb Exp $
machine amd64 # architecture, used by config; REQUIRED
@@ -291,7 +291,6 @@ wi* at pci? # WaveLAN IEEE 802.11DS
wi* at pcmcia? # WaveLAN IEEE 802.11DS
an* at pcmcia? # Aironet IEEE 802.11DS
#cnw* at pcmcia? # Xircom Netwave
-#ray* at pcmcia? # Raylink Aviator2.4/Pro 802.11FH
ipw* at pci? # Intel PRO/Wireless 2100
iwi* at pci? # Intel PRO/Wireless 2200BG/2915ABG
wpi* at pci? # Intel PRO/Wireless 3945ABG
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index a3efc12e6ef..30a726ae18e 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.748 2013/08/12 04:11:52 jsg Exp $
+# $OpenBSD: GENERIC,v 1.749 2013/08/13 16:26:23 mikeb Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -612,7 +612,6 @@ an* at pci? # Aironet IEEE 802.11DS
an* at isapnp? # Aironet IEEE 802.11DS
an* at pcmcia? # Aironet IEEE 802.11DS
#cnw* at pcmcia? # Xircom Netwave
-ray* at pcmcia? # Raylink Aviator2.4/Pro 802.11FH
ipw* at pci? # Intel PRO/Wireless 2100
iwi* at pci? # Intel PRO/Wireless 2200BG/2915ABG
wpi* at pci? # Intel PRO/Wireless 3945ABG
diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK
index 529b8a06c42..2038a2dfa9f 100644
--- a/sys/arch/i386/conf/RAMDISK
+++ b/sys/arch/i386/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.180 2013/06/14 01:00:24 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.181 2013/08/13 16:26:24 mikeb Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -238,7 +238,6 @@ wi* at pci? # WaveLAN IEEE 802.11DS
wi* at pcmcia? # WaveLAN IEEE 802.11DS
#an* at pcmcia? # Aironet IEEE 802.11DS
#cnw* at pcmcia? # Xircom Netwave
-#ray* at pcmcia? # Raylink Aviator2.4/Pro 802.11FH
# Media Independent Interface (mii) drivers
exphy* at mii? # 3Com internal PHYs
diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB
index 7c8132c23f8..f2950d2f5ce 100644
--- a/sys/arch/i386/conf/RAMDISKB
+++ b/sys/arch/i386/conf/RAMDISKB
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKB,v 1.121 2012/03/15 20:06:03 deraadt Exp $
+# $OpenBSD: RAMDISKB,v 1.122 2013/08/13 16:26:25 mikeb Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -247,7 +247,6 @@ nfe* at pci? # NVIDIA nForce Ethernet
#wi* at pcmcia? # WaveLAN IEEE 802.11DS
#an* at pcmcia? # Aironet IEEE 802.11DS
#cnw* at pcmcia? # Xircom Netwave
-#ray* at pcmcia? # Raylink Aviator2.4/Pro 802.11FH
# Media Independent Interface (mii) drivers
#exphy* at mii? # 3Com internal PHYs
diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC
index 7c7e210da96..c188c418b66 100644
--- a/sys/arch/i386/conf/RAMDISKC
+++ b/sys/arch/i386/conf/RAMDISKC
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKC,v 1.103 2013/06/09 18:06:33 deraadt Exp $
+# $OpenBSD: RAMDISKC,v 1.104 2013/08/13 16:26:25 mikeb Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -281,7 +281,6 @@ ath* at cardbus? # Atheros AR5k (802.11a/b/g)
#iwi* at pci? # Intel PRO/Wireless 2200BG/2915ABG
#an* at pcmcia? # Aironet IEEE 802.11DS
#cnw* at pcmcia? # Xircom Netwave
-#ray* at pcmcia? # Raylink Aviator2.4/Pro 802.11FH
#ral* at pci? # Ralink RT2500/RT2501/RT2600
#ral* at cardbus? # Ralink RT2500/RT2501/RT2600
#rtw* at pci? # Realtek 8180
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index 7fe929b4863..d514f14a819 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.198 2013/04/05 13:28:59 deraadt Exp $
+# $OpenBSD: RAMDISK_CD,v 1.199 2013/08/13 16:26:25 mikeb Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -360,7 +360,6 @@ wi* at pci? # WaveLAN IEEE 802.11DS
wi* at pcmcia? # WaveLAN IEEE 802.11DS
an* at pcmcia? # Aironet IEEE 802.11DS
#cnw* at pcmcia? # Xircom Netwave
-ray* at pcmcia? # Raylink Aviator2.4/Pro 802.11FH
ipw* at pci? # Intel PRO/Wireless 2100
iwi* at pci? # Intel PRO/Wireless 2200BG/2915ABG
wpi* at pci? # Intel PRO/Wireless 3945ABG