From 389ed6f87318b452b48ea0222b2bf12952498ac4 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Mon, 19 Jan 2004 02:18:34 +0000
Subject: [PATCH] Fixed misplacement and bitrot in the cy driver's
 configuration in rev.1.1040.  It is a miscellaneous isa+pci driver, but came
 back described as a pci-only driver and placed in an i4b pci subsection after
 its migration to /sys/conf/NOTES.  Put it back where it used to be, fully
 unsorted in the `Miscellaneous hardware' section.  Reduced nearby disorder in
 this section by moving configuration of the digi driver to where it was for
 the old digiboard drivers, so that the order at least matches the order in
 the table of contents.

---
 sys/i386/conf/NOTES | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 901705f025d7..206822b1238f 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -619,6 +619,7 @@ options		SAFE_RNDTEST	# enable rndtest support
 # apm: Laptop Advanced Power Management (experimental)
 # pmtimer: Timer device driver for power management events (APM or ACPI)
 # spigot: The Creative Labs Video Spigot video-acquisition board
+# cy: Cyclades serial driver
 # digi: Digiboard driver
 # gp:  National Instruments AT-GPIB and AT-GPIB/TNT board, PCMCIA-GPIB
 # asc: GI1904-based hand scanners, e.g. the Trust Amiscan Grey
@@ -692,13 +693,12 @@ hint.spigot.0.maddr="0xee000"
 device		apm
 hint.apm.0.flags="0x20"
 device		pmtimer			# Adjust system timer at wakeup time
-device		gp
-hint.gp.0.at="isa"
-hint.gp.0.port="0x2c0"
-device		gsc	1
-hint.gsc.0.at="isa"
-hint.gsc.0.port="0x270"
-hint.gsc.0.drq="3"
+device		cy	1
+options 	CY_PCI_FASTINTR		# Use with cy_pci unless irq is shared
+hint.cy.0.at="isa"
+hint.cy.0.irq="10"
+hint.cy.0.maddr="0xd4000"
+hint.cy.0.msize="0x2000"
 device		digi
 hint.digi.0.at="isa"
 hint.digi.0.port="0x104"
@@ -711,6 +711,13 @@ device		digi_EPCX_PCI
 device		digi_Xe
 device		digi_Xem
 device		digi_Xr
+device		gp
+hint.gp.0.at="isa"
+hint.gp.0.port="0x2c0"
+device		gsc	1
+hint.gsc.0.at="isa"
+hint.gsc.0.port="0x270"
+hint.gsc.0.drq="3"
 device		asc	1
 hint.asc.0.at="isa"
 hint.asc.0.port="0x3EB"
@@ -877,19 +884,9 @@ options 	COMPAQ_M610
 # PCI bus Cards:
 # --------------
 #
-# Cyclades Cyclom-Y PCI serial driver
-device		cy	1
-options 	CY_PCI_FASTINTR		# Use with cy_pci unless irq is shared
-hint.cy.0.at="isa"
-hint.cy.0.irq="10"
-hint.cy.0.maddr="0xd4000"
-hint.cy.0.msize="0x2000"
-#
-#---------------------------------------------------------------------------
 # ELSA MicroLink ISDN/PCI (same as ELSA QuickStep 1000pro PCI)
 options 	ELSA_QS1PCI
 #
-#
 #---------------------------------------------------------------------------
 #	ifpnp driver for AVM Fritz!Card PnP
 #