summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/amd64/conf/RAMDISK4
-rw-r--r--sys/arch/amd64/conf/RAMDISK_CD4
-rw-r--r--sys/arch/i386/conf/GENERIC4
-rw-r--r--sys/arch/i386/conf/RAMDISK4
-rw-r--r--sys/arch/i386/conf/RAMDISKB4
-rw-r--r--sys/arch/i386/conf/RAMDISKC4
-rw-r--r--sys/arch/i386/conf/RAMDISK_CD4
-rw-r--r--sys/arch/macppc/conf/RAMDISK4
-rw-r--r--sys/arch/mvmeppc/conf/GENERIC4
-rw-r--r--sys/arch/mvmeppc/conf/RAMDISK4
10 files changed, 10 insertions, 30 deletions
diff --git a/sys/arch/amd64/conf/RAMDISK b/sys/arch/amd64/conf/RAMDISK
index d113e641e98..7744c9b91d8 100644
--- a/sys/arch/amd64/conf/RAMDISK
+++ b/sys/arch/amd64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.23 2005/05/22 21:44:37 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.24 2005/05/27 02:08:14 martin Exp $
machine amd64 # architecture, used by config; REQUIRED
@@ -142,8 +142,6 @@ scsibus* at ami?
#scsibus* at isp?
#aic* at pcmcia? # PCMCIA Adaptec 152[02] SCSI
#scsibus* at aic?
-#ncr* at pci? # NCR 538XX SCSI controllers(old)
-#scsibus* at ncr?
#siop* at pci? # NCR 538XX SCSI controllers(new)
#scsibus* at siop?
#adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI
diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD
index a4442bf65d6..e4172c7d65c 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.32 2005/05/24 09:55:45 brad Exp $
+# $OpenBSD: RAMDISK_CD,v 1.33 2005/05/27 02:08:14 martin Exp $
machine amd64 # architecture, used by config; REQUIRED
@@ -159,8 +159,6 @@ isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel
scsibus* at isp?
#aic* at pcmcia? # PCMCIA based aic SCSI controllers
#scsibus* at aic?
-#ncr* at pci? # NCR 538XX SCSI controllers(old)
-#scsibus* at ncr?
#siop* at pci? # NCR 538XX SCSI controllers(new)
#scsibus* at siop?
#adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index da62ba9ca4c..42a9a622555 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.415 2005/05/26 23:18:27 drahn Exp $
+# $OpenBSD: GENERIC,v 1.416 2005/05/27 02:08:14 martin Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -295,8 +295,6 @@ aic* at isapnp? # isapnp configured aic SCSI controllers
scsibus* at aic?
#esp* at pcmcia? # PCMCIA based NCR 53C9X SCSI
#scsibus* at esp?
-#ncr* at pci? # NCR 538XX SCSI controllers(old)
-#scsibus* at ncr?
siop* at pci? # NCR 538XX SCSI controllers(new)
scsibus* at siop?
adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI
diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK
index eae4c6fbabf..164b0237804 100644
--- a/sys/arch/i386/conf/RAMDISK
+++ b/sys/arch/i386/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.138 2005/05/10 01:16:31 brad Exp $
+# $OpenBSD: RAMDISK,v 1.139 2005/05/27 02:08:14 martin Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -140,8 +140,6 @@ scsibus* at ahc?
#aic* at isapnp?
#aic* at pcmcia? # PCMCIA based aic SCSI controllers
#scsibus* at aic?
-#ncr* at pci? # NCR 538XX SCSI controllers(old)
-#scsibus* at ncr?
siop* at pci? # NCR 538XX SCSI controllers(new)
scsibus* at siop?
#adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI
diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB
index 55de72f29b8..3c6b6232ed4 100644
--- a/sys/arch/i386/conf/RAMDISKB
+++ b/sys/arch/i386/conf/RAMDISKB
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKB,v 1.81 2005/05/10 01:16:31 brad Exp $
+# $OpenBSD: RAMDISKB,v 1.82 2005/05/27 02:08:14 martin Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -154,8 +154,6 @@ scsibus* at isp?
#aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers
#aic* at isapnp?
#scsibus* at aic?
-#ncr* at pci? # NCR 538XX SCSI controllers(old)
-#scsibus* at ncr?
#siop* at pci? # NCR 538XX SCSI controllers(new)
#scsibus* at siop?
#adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI
diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC
index e59c54c322b..3443130c1de 100644
--- a/sys/arch/i386/conf/RAMDISKC
+++ b/sys/arch/i386/conf/RAMDISKC
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKC,v 1.57 2005/05/10 01:16:31 brad Exp $
+# $OpenBSD: RAMDISKC,v 1.58 2005/05/27 02:08:14 martin Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -176,8 +176,6 @@ pccom* at pcmcia? # PCMCIA modem cards
#aic* at isapnp?
#aic* at pcmcia? # PCMCIA based aic SCSI controllers
#scsibus* at aic?
-#ncr* at pci? # NCR 538XX SCSI controllers(old)
-#scsibus* at ncr?
#siop* at pci? # NCR 538XX SCSI controllers(new)
#scsibus* at siop?
#adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index b9cec934d89..0e5434b348c 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.95 2005/05/10 01:16:31 brad Exp $
+# $OpenBSD: RAMDISK_CD,v 1.96 2005/05/27 02:08:14 martin Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -212,8 +212,6 @@ aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers
aic* at isapnp?
aic* at pcmcia? # PCMCIA based aic SCSI controllers
scsibus* at aic?
-#ncr* at pci? # NCR 538XX SCSI controllers(old)
-#scsibus* at ncr?
siop* at pci? # NCR 538XX SCSI controllers(new)
scsibus* at siop?
adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI
diff --git a/sys/arch/macppc/conf/RAMDISK b/sys/arch/macppc/conf/RAMDISK
index 51abcf5ba52..71a2cf85c64 100644
--- a/sys/arch/macppc/conf/RAMDISK
+++ b/sys/arch/macppc/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.49 2005/05/24 07:51:21 brad Exp $
+# $OpenBSD: RAMDISK,v 1.50 2005/05/27 02:08:14 martin Exp $
#
# PPC GENERIC config file
#
@@ -44,7 +44,6 @@ ppb* at pci? # PCI-PCI bridges
pci* at ppb?
siop* at pci?
-#ncr* at pci?
fxp* at pci?
de* at pci?
#vme* at pci?
@@ -124,7 +123,6 @@ zsc* at macobio?
zstty* at zsc?
scsibus* at siop?
-#scsibus* at ncr?
#scsibus* at adv?
scsibus* at ahc?
#scsibus* at bha?
diff --git a/sys/arch/mvmeppc/conf/GENERIC b/sys/arch/mvmeppc/conf/GENERIC
index 3ab0bb284e1..6949a93866b 100644
--- a/sys/arch/mvmeppc/conf/GENERIC
+++ b/sys/arch/mvmeppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.8 2005/04/30 00:49:36 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.9 2005/05/27 02:08:14 martin Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -44,7 +44,6 @@ pci* at mpcpcibr0
pchb* at pci? # PCI host bridge
pcib* at pci? # PCI-ISA bridge
siop* at pci?
-#ncr* at pci?
de* at pci?
#vme* at pci?
#pciide* at pci?
@@ -71,7 +70,6 @@ isa* at pcib?
#### SCSI attachment points
scsibus* at siop?
-#scsibus* at ncr?
#wdc* at mainbus? flags 0x0
#wd* at wdc? flags 0x0000
diff --git a/sys/arch/mvmeppc/conf/RAMDISK b/sys/arch/mvmeppc/conf/RAMDISK
index b4185133cc1..c4c6952dbdf 100644
--- a/sys/arch/mvmeppc/conf/RAMDISK
+++ b/sys/arch/mvmeppc/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.10 2005/05/01 07:54:42 david Exp $
+# $OpenBSD: RAMDISK,v 1.11 2005/05/27 02:08:14 martin Exp $
#
# MVMEPPC GENERIC config file
#
@@ -40,7 +40,6 @@ pci* at mpcpcibr0
pchb* at pci? # PCI host bridge
pcib* at pci? # PCI-ISA bridge
siop* at pci?
-#ncr* at pci?
de* at pci?
#vme* at pci?
#pciide* at pci?
@@ -67,7 +66,6 @@ isa* at pcib?
#### SCSI attachment points
scsibus* at siop?
-#scsibus* at ncr?
#wdc* at mainbus? flags 0x0
#wd* at wdc? flags 0x0000