summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2008-05-07 02:31:02 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2008-05-07 02:31:02 +0000
commita85f69c61a76f9552e1ef6903a57fa34a93fb5a0 (patch)
treee982d8e33c01b859881e98dc1f670f708b164001
parent37ad6d05bd2a0bd47a4a26e3fd229454e994e870 (diff)
Rather than fixing ises(4), nuke it.
ok deraadt@
-rw-r--r--share/man/man4/Makefile4
-rw-r--r--sys/arch/i386/conf/GENERIC3
-rw-r--r--sys/dev/pci/files.pci7
3 files changed, 4 insertions, 10 deletions
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index e9865a41434..64871df4d36 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.452 2008/04/29 05:33:24 cnst Exp $
+# $OpenBSD: Makefile,v 1.453 2008/05/07 02:31:01 krw Exp $
MAN= aac.4 ac97.4 acphy.4 \
acpi.4 acpiac.4 acpiasus.4 acpibat.4 acpibtn.4 acpicpu.4 acpidock.4 \
@@ -26,7 +26,7 @@ MAN= aac.4 ac97.4 acphy.4 \
ichiic.4 ichwdt.4 icmp.4 icmp6.4 icsphy.4 ifmedia.4 \
iha.4 iic.4 inet.4 inet6.4 inphy.4 iop.4 iophy.4 ioprbs.4 \
iopsp.4 ip.4 ip6.4 ipcomp.4 ipgphy.4 ipmi.4 ips.4 ipsec.4 ipw.4 \
- isa.4 isagpio.4 isapnp.4 ises.4 isp.4 it.4 iwi.4 iwn.4 ixgb.4 \
+ isa.4 isagpio.4 isapnp.4 isp.4 it.4 iwi.4 iwn.4 ixgb.4 \
jmb.4 \
kate.4 km.4 ksyms.4 kue.4 lc.4 lge.4 lii.4 lkm.4 lm.4 \
lmc.4 lmenv.4 lmn.4 lmtemp.4 lo.4 lofn.4 lpt.4 lxtphy.4 luphy.4 \
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index c2f4d3354c0..22e9ac7948f 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.615 2008/04/29 05:39:24 cnst Exp $
+# $OpenBSD: GENERIC,v 1.616 2008/05/07 02:31:01 krw Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -741,7 +741,6 @@ lofn* at pci? # Hi/fn 6500 crypto card
nofn* at pci? # Hi/fn 7814/7851/7854 crypto card
ubsec* at pci? # Bluesteel Networks 5xxx crypto card
safe* at pci? # SafeNet SafeXcel 1141/1741
-#ises* at pci? # Pijnenburg PCC-ISES
glxsb* at pci? # AMD Geode LX series processor security block
# I2O
diff --git a/sys/dev/pci/files.pci b/sys/dev/pci/files.pci
index 17c4bb71037..3b53dccad52 100644
--- a/sys/dev/pci/files.pci
+++ b/sys/dev/pci/files.pci
@@ -1,4 +1,4 @@
-# $OpenBSD: files.pci,v 1.252 2008/04/29 05:29:59 cnst Exp $
+# $OpenBSD: files.pci,v 1.253 2008/05/07 02:31:01 krw Exp $
# $NetBSD: files.pci,v 1.20 1996/09/24 17:47:15 christos Exp $
#
# Config file and device description for machine-independent PCI code.
@@ -435,11 +435,6 @@ device noct: crypto
attach noct at pci
file dev/pci/noct.c noct
-# Pijnenburg PCC-ISES
-device ises: crypto
-attach ises at pci
-file dev/pci/ises.c ises
-
# Safenet SafeXcel 1141
device safe: crypto
attach safe at pci