summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-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/hppa/conf/GENERIC3
-rw-r--r--sys/arch/hppa/conf/RAMDISK3
-rw-r--r--sys/arch/hppa64/conf/GENERIC3
-rw-r--r--sys/arch/hppa64/conf/RAMDISK3
7 files changed, 7 insertions, 14 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index fc3a77ebc10..a0f83dbf72a 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.350 2013/10/21 05:52:15 dlg Exp $
+# $OpenBSD: GENERIC,v 1.351 2013/10/29 22:37:25 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -402,7 +402,6 @@ ne* at pcmcia? # PCMCIA based NE2000 ethernet
ep* at pcmcia? # PCMCIA based 3C5xx ethernet
sm* at pcmcia? # PCMCIA based sm ethernet
xe* at pcmcia? # Xircom ethernet
-#fpa* at pci? # DEC DEFPA FDDI
xl* at pci? # 3C9xx ethernet
xl* at cardbus? # 3C575/3C656 ethernet
rl* at pci? # RealTek 81[23]9 ethernet
diff --git a/sys/arch/amd64/conf/RAMDISK b/sys/arch/amd64/conf/RAMDISK
index 115a1a0ff42..1d572164ead 100644
--- a/sys/arch/amd64/conf/RAMDISK
+++ b/sys/arch/amd64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.58 2013/08/20 14:27:25 ajacoutot Exp $
+# $OpenBSD: RAMDISK,v 1.59 2013/10/29 22:37:25 deraadt Exp $
machine amd64 # architecture, used by config; REQUIRED
@@ -188,7 +188,6 @@ fxp* at pci? # EtherExpress 10/100B ethernet
#ep* at pcmcia? # PCMCIA based 3C5xx ethernet
#sm* at pcmcia? # PCMCIA based sm ethernet
#xe* at pcmcia? # Xircom ethernet
-#fpa* at pci? # DEC DEFPA FDDI
#xl* at pci? # 3C9xx ethernet
#xl* at cardbus? # 3C575 ethernet
rl* at pci? # RealTek 81[23]9 ethernet
diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD
index 5d8901096cb..d945f50f7ed 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.129 2013/10/21 05:52:15 dlg Exp $
+# $OpenBSD: RAMDISK_CD,v 1.130 2013/10/29 22:37:25 deraadt Exp $
machine amd64 # architecture, used by config; REQUIRED
@@ -230,7 +230,6 @@ ne* at pcmcia? # PCMCIA based NE2000 ethernet
ep* at pcmcia? # PCMCIA based 3C5xx ethernet
sm* at pcmcia? # PCMCIA based sm ethernet
xe* at pcmcia? # Xircom ethernet
-#fpa* at pci? # DEC DEFPA FDDI
xl* at pci? # 3C9xx ethernet
xl* at cardbus? # 3C575 ethernet
rl* at pci? # RealTek 81[23]9 ethernet
diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC
index 85e8b93c2d7..e0aba489af8 100644
--- a/sys/arch/hppa/conf/GENERIC
+++ b/sys/arch/hppa/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.152 2013/09/05 19:42:07 sasano Exp $
+# $OpenBSD: GENERIC,v 1.153 2013/10/29 22:37:25 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -264,7 +264,6 @@ em* at pci? # Intel Pro/1000 ethernet
ti* at pci? # Alteon Tigon 1Gb ethernet
#txp* at pci? # 3com 3CR990
#epic* at pci? # SMC EPIC/100 ethernet
-#fpa* at pci? # DEC DEFPA FDDI
#de* at pci? # 21x4[012]-based Ethernet
#de* at eisa?
dc* at pci? # 21143, "tulip" clone ethernet
diff --git a/sys/arch/hppa/conf/RAMDISK b/sys/arch/hppa/conf/RAMDISK
index b57e29e2837..d5d75659c6b 100644
--- a/sys/arch/hppa/conf/RAMDISK
+++ b/sys/arch/hppa/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.97 2013/08/20 14:27:26 ajacoutot Exp $
+# $OpenBSD: RAMDISK,v 1.98 2013/10/29 22:37:25 deraadt Exp $
#
# Diskless kernel config
#
@@ -239,7 +239,6 @@ em* at pci? # Intel Pro/1000 ethernet
#ti* at pci? # Alteon Tigon 1Gb ethernet
#txp* at pci? # 3com 3CR990
#epic* at pci? # SMC EPIC/100 ethernet
-#fpa* at pci? # DEC DEFPA FDDI
#de* at pci? # 21x4[012]-based Ethernet
#de* at eisa?
dc* at pci? # 21143, "tulip" clone ethernet
diff --git a/sys/arch/hppa64/conf/GENERIC b/sys/arch/hppa64/conf/GENERIC
index 4c4d95d19ca..93e9525bd5c 100644
--- a/sys/arch/hppa64/conf/GENERIC
+++ b/sys/arch/hppa64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.29 2013/08/20 14:27:27 ajacoutot Exp $
+# $OpenBSD: GENERIC,v 1.30 2013/10/29 22:37:25 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -126,7 +126,6 @@ siop* at pci? # NCR 538XX SCSI controllers(new)
#ti* at pci? # Alteon Tigon 1Gb ethernet
#txp* at pci? # 3com 3CR990
#epic* at pci? # SMC EPIC/100 ethernet
-#fpa* at pci? # DEC DEFPA FDDI
dc* at pci? # 21143, "tulip" clone ethernet
#dc* at cardbus?
#rl* at pci? # RealTek 81[23]9 ethernet
diff --git a/sys/arch/hppa64/conf/RAMDISK b/sys/arch/hppa64/conf/RAMDISK
index b1f4fec5de7..34e4dae9140 100644
--- a/sys/arch/hppa64/conf/RAMDISK
+++ b/sys/arch/hppa64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.16 2013/08/20 14:27:27 ajacoutot Exp $
+# $OpenBSD: RAMDISK,v 1.17 2013/10/29 22:37:25 deraadt Exp $
#
# Diskless kernel config
#
@@ -129,7 +129,6 @@ siop* at pci? # NCR 538XX SCSI controllers(new)
#ti* at pci? # Alteon Tigon 1Gb ethernet
#txp* at pci? # 3com 3CR990
#epic* at pci? # SMC EPIC/100 ethernet
-#fpa* at pci? # DEC DEFPA FDDI
dc* at pci? # 21143, "tulip" clone ethernet
#dc* at cardbus?
#rl* at pci? # RealTek 81[23]9 ethernet