summaryrefslogtreecommitdiff
path: root/sys/arch/amd64/conf
diff options
context:
space:
mode:
authorMike Belopuhov <mikeb@cvs.openbsd.org>2013-08-13 16:26:29 +0000
committerMike Belopuhov <mikeb@cvs.openbsd.org>2013-08-13 16:26:29 +0000
commit0520be97f03c56573063f82877bdb39b213b8b9f (patch)
tree706f5c6e15b5a58f8097171d6a1a855fb33d137b /sys/arch/amd64/conf
parentc121604a5734ac41552ab46a8ab75345be99036e (diff)
Let ray(4) rot in the attic. OK mpi, jsg, kettenis, henning, millert.
Mickey approves these changes.
Diffstat (limited to 'sys/arch/amd64/conf')
-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
3 files changed, 3 insertions, 6 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