Module Name: src
Committed By: jdolecek
Date: Sun Dec 3 14:21:05 UTC 2017
Modified Files:
src/sys/arch/amiga/conf [tls-maxphys]: GENERIC
src/sys/dev/pci [tls-maxphys]: files.pci
Log Message:
fix back some more incorrect sync
To generate a diff of this commit:
cvs rdiff -u -r1.289.2.5 -r1.289.2.6 src/sys/arch/amiga/conf/GENERIC
cvs rdiff -u -r1.360.2.4 -r1.360.2.5 src/sys/dev/pci/files.pci
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/conf/GENERIC
diff -u src/sys/arch/amiga/conf/GENERIC:1.289.2.5 src/sys/arch/amiga/conf/GENERIC:1.289.2.6
--- src/sys/arch/amiga/conf/GENERIC:1.289.2.5 Sun Dec 3 11:35:48 2017
+++ src/sys/arch/amiga/conf/GENERIC Sun Dec 3 14:21:05 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.289.2.5 2017/12/03 11:35:48 jdolecek Exp $
+# $NetBSD: GENERIC,v 1.289.2.6 2017/12/03 14:21:05 jdolecek Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.289.2.5 $"
+#ident "GENERIC-$Revision: 1.289.2.6 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -433,10 +433,10 @@ gencp* at acafhbus? # clockport on ACA
wdc0 at mainbus0 # A4000 & A1200 IDE bus
wdc* at zbus0 # Buddha / Catweasel
-efa0 at mainbus0 # ELBOX FastATA 1200 Mk-III/Mk-IV
+#efa0 at mainbus0 # ELBOX FastATA 1200 Mk-III/Mk-IV
atabus* at wdc? channel ? # ATA bus
-atabus* at efa? channel ? # ATA bus
+#atabus* at efa? channel ? # ATA bus
atabus* at ata? channel ? # ATA bus
wd* at atabus? drive ? # + drives
atapibus* at atabus? # ATAPI bus
Index: src/sys/dev/pci/files.pci
diff -u src/sys/dev/pci/files.pci:1.360.2.4 src/sys/dev/pci/files.pci:1.360.2.5
--- src/sys/dev/pci/files.pci:1.360.2.4 Sun Dec 3 11:37:07 2017
+++ src/sys/dev/pci/files.pci Sun Dec 3 14:21:05 2017
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.360.2.4 2017/12/03 11:37:07 jdolecek Exp $
+# $NetBSD: files.pci,v 1.360.2.5 2017/12/03 14:21:05 jdolecek Exp $
#
# Config file and device description for machine-independent PCI code.
# Included by ports that need it. Requires that the SCSI files be
@@ -107,11 +107,6 @@ file dev/pci/icp_pci.c icp_pci
attach aac at pci with aac_pci
file dev/pci/aac_pci.c aac_pci
-# IBM ServeRAID RAID controllers
-device ips: scsi
-attach ips at pci
-file dev/pci/ips.c ips
-
# DPT EATA SCSI controllers
attach dpt at pci with dpt_pci
file dev/pci/dpt_pci.c dpt_pci
