[src/netbsd-8]: src/sys/arch/atari/conf Regen for ticket #624

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

details:   https://anonhg.NetBSD.org/src/rev/1bb708bc01ea
branches:  netbsd-8
changeset: 434731:1bb708bc01ea
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Mar 13 13:42:54 2018 +0000

description:
Regen for ticket #624

diffstat:

 sys/arch/atari/conf/MILAN-ISAIDE |  12 ++++--------
 sys/arch/atari/conf/MILAN-PCIIDE |  24 +++++-------------------
 2 files changed, 9 insertions(+), 27 deletions(-)

diffs (90 lines):

diff -r 47765bf2e1d6 -r 1bb708bc01ea sys/arch/atari/conf/MILAN-ISAIDE
--- a/sys/arch/atari/conf/MILAN-ISAIDE  Tue Mar 13 13:41:13 2018 +0000
+++ b/sys/arch/atari/conf/MILAN-ISAIDE  Tue Mar 13 13:42:54 2018 +0000
@@ -1,12 +1,12 @@
 #
-# $NetBSD: MILAN-ISAIDE,v 1.87 2016/12/13 20:42:16 christos Exp $
+# $NetBSD: MILAN-ISAIDE,v 1.87.8.1 2018/03/13 13:42:54 martin Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
 #
 # Created from:
-#              NetBSD: MILAN.in,v 1.27 2014/07/05 09:24:23 tsutsui Exp $
-#              NetBSD: GENERIC.in,v 1.109 2014/11/24 08:23:48 tsutsui Exp $
+#              NetBSD: MILAN.in,v 1.27.20.1 2018/03/13 13:41:13 martin Exp $
+#              NetBSD: GENERIC.in,v 1.112.8.1 2018/01/26 14:28:15 martin Exp $
 include "arch/atari/conf/std.milan"
 options INCLUDE_CONFIG_FILE # embed config file in kernel binary
 makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -89,9 +89,7 @@
 fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
 eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
 audio* at eso?
-
-spkr*  at audio?               # PC speaker (synthesized)
-
+spkr* at audio? # PC speaker (synthesized)
 options WSEMUL_VT100 # VT100 / VT220 emulation
 options WS_KERNEL_FG=WSCOL_WHITE
 options WS_KERNEL_BG=WSCOL_BLACK
@@ -114,8 +112,6 @@
 pckbc0 at isa? # PC keyboard controller
 pckbd* at pckbc? # PC keyboard
 wskbd* at pckbd? console ? # wscons keyboard
-
 wd* at atabus? drive ?
 atapibus* at atabus? # ATAPI bus support
-
 cd* at atapibus? drive ? # ATAPI CD-ROM drives
diff -r 47765bf2e1d6 -r 1bb708bc01ea sys/arch/atari/conf/MILAN-PCIIDE
--- a/sys/arch/atari/conf/MILAN-PCIIDE  Tue Mar 13 13:41:13 2018 +0000
+++ b/sys/arch/atari/conf/MILAN-PCIIDE  Tue Mar 13 13:42:54 2018 +0000
@@ -1,12 +1,12 @@
 #
-# $NetBSD: MILAN-PCIIDE,v 1.91 2016/12/13 20:42:16 christos Exp $
+# $NetBSD: MILAN-PCIIDE,v 1.91.8.1 2018/03/13 13:42:54 martin Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
 #
 # Created from:
-#              NetBSD: MILAN.in,v 1.27 2014/07/05 09:24:23 tsutsui Exp $
-#              NetBSD: GENERIC.in,v 1.109 2014/11/24 08:23:48 tsutsui Exp $
+#              NetBSD: MILAN.in,v 1.27.20.1 2018/03/13 13:41:13 martin Exp $
+#              NetBSD: GENERIC.in,v 1.112.8.1 2018/01/26 14:28:15 martin Exp $
 include "arch/atari/conf/std.milan"
 options INCLUDE_CONFIG_FILE # embed config file in kernel binary
 makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -89,9 +89,7 @@
 fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
 eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
 audio* at eso?
-
-spkr*  at audio?               # PC speaker (synthesized)
-
+spkr* at audio? # PC speaker (synthesized)
 options WSEMUL_VT100 # VT100 / VT220 emulation
 options WS_KERNEL_FG=WSCOL_WHITE
 options WS_KERNEL_BG=WSCOL_BLACK
@@ -107,19 +105,7 @@
 fdcisa0 at isa? port 0x3f0 irq 6 drq 2 # standard PC floppy contr.
 fdisa0 at fdcisa0 drive 0
 pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver
-acardide* at pci? dev ? function ? # Acard IDE controllers
-aceride* at pci? dev ? function ? # Acer Lab IDE controllers
-artsata* at pci? dev ? function ? # Intel i31244 SATA controller
-cmdide* at pci? dev ? function ? # CMD tech IDE controllers
-cypide* at pci? dev ? function ? # Cypress IDE controllers
-hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers
-optiide* at pci? dev ? function ? # Opti IDE controllers
-pdcide* at pci? dev ? function ? # Promise IDE controllers
-pdcsata* at pci? dev ? function ? # Promise SATA150 controllers
-satalink* at pci? dev ? function ? # SiI SATALink controllers
-siside* at pci? dev ? function ? # SiS IDE controllers
-slide* at pci? dev ? function ? # Symphony Labs IDE controllers
-viaide* at pci? dev ? function ? # VIA/AMD/Nvidia IDE controllers
+piixide* at pci? dev ? function ? # Intel IDE controllers
 atabus* at ata? channel ?
 vga0 at pci? dev ? function ? # a PCI VGA card
 wsdisplay* at vga? console ? # as a wscons console