[src/tls-maxphys]: src/sys fix back some more incorrect sync

[jdolecek <jdolecek%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4a72cba22672
branches:  tls-maxphys
changeset: 852981:4a72cba22672
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Sun Dec 03 14:21:05 2017 +0000

description:
fix back some more incorrect sync

diffstat:

 sys/arch/amiga/conf/GENERIC |  8 ++++----
 sys/dev/pci/files.pci       |  7 +------
 2 files changed, 5 insertions(+), 10 deletions(-)

diffs (52 lines):

diff -r dec2eb76f7a6 -r 4a72cba22672 sys/arch/amiga/conf/GENERIC
--- a/sys/arch/amiga/conf/GENERIC       Sun Dec 03 11:52:57 2017 +0000
+++ b/sys/arch/amiga/conf/GENERIC       Sun Dec 03 14:21:05 2017 +0000
@@ -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 @@
 
 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 @@
 
 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
diff -r dec2eb76f7a6 -r 4a72cba22672 sys/dev/pci/files.pci
--- a/sys/dev/pci/files.pci     Sun Dec 03 11:52:57 2017 +0000
+++ b/sys/dev/pci/files.pci     Sun Dec 03 14:21:05 2017 +0000
@@ -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 @@
 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