From ac44076d62b8dbe6acc1dfb16eaef21983874fb2 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 3 Dec 2003 23:06:30 +0000
Subject: [PATCH] Connect the cx driver to its new location in the tree. Update
 notes to reflect that cx is no longer a counted device Update options for new
 cx option # commented out ELAN_PPS and ELAN_XTAL since they produced errors

Submitted by: rik@cronyx.ru
Approved by: re@ <scottl>
---
 sys/conf/files.i386   | 6 +++---
 sys/conf/options.i386 | 3 +++
 sys/i386/conf/NOTES   | 8 ++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index eeb1bb5efc7e..1f3f1bf4b5f8 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -118,6 +118,9 @@ dev/ar/if_ar.c			optional	ar
 dev/ar/if_ar_pci.c		optional	ar pci
 dev/ar/if_ar_isa.c		optional	ar isa
 dev/cm/if_cm_isa.c		optional	cm isa
+dev/cx/csigma.c			optional	cx
+dev/cx/cxddk.c			optional	cx
+dev/cx/if_cx.c			optional	cx
 dev/dgb/dgb.c			count		dgb
 dev/ed/if_ed_isa.c		optional	ed isa
 dev/fb/fb.c			optional	fb
@@ -243,15 +246,12 @@ i386/isa/asc.c			count		asc
 i386/isa/atpic.c		standard
 i386/isa/atpic_vector.s		standard
 i386/isa/clock.c		standard
-i386/isa/cronyx.c		optional	cx
 i386/isa/ctx.c			optional	ctx
-i386/isa/cx.c			count		cx
 i386/isa/cy.c			count		cy
 i386/isa/elink.c		optional	ep
 i386/isa/elink.c		optional	ie
 i386/isa/gpib.c			optional	gp
 i386/isa/gsc.c			count		gsc
-i386/isa/if_cx.c		optional	cx
 i386/isa/if_el.c		count		el
 i386/isa/if_le.c		count		le
 i386/isa/if_rdp.c		count		rdp
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index efb2668e49cd..8475b09b7c6d 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -108,6 +108,9 @@ PCVT_GREENSAVER		opt_pcvt.h
 # Video spigot
 SPIGOT_UNSECURE		opt_spigot.h
 
+# Enables NETGRAPH support for Cronyx adapters
+NETGRAPH_CRONYX		opt_ng_cronyx.h
+
 # -------------------------------
 # isdn4bsd: passive ISA cards
 # -------------------------------
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index d41bf3c492af..fb163f72d397 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -181,8 +181,8 @@ options 	CPU_DIRECT_MAPPED_CACHE
 options 	CPU_DISABLE_5X86_LSSER
 options 	CPU_ELAN
 options 	CPU_SOEKRIS
-options 	ELAN_XTAL=32768000
-options 	ELAN_PPS
+#options 	ELAN_XTAL=32768000
+#options 	ELAN_PPS
 options 	CPU_ENABLE_SSE
 #options 	CPU_DISABLE_SSE
 options 	CPU_FASTER_5X86_FPU
@@ -506,7 +506,7 @@ hint.ar.0.at="isa"
 hint.ar.0.port="0x300"
 hint.ar.0.irq="10"
 hint.ar.0.maddr="0xd0000"
-device		cx	1
+device		cx
 hint.cx.0.at="isa"
 hint.cx.0.port="0x240"
 hint.cx.0.irq="15"
@@ -702,7 +702,7 @@ device		gsc	1
 hint.gsc.0.at="isa"
 hint.gsc.0.port="0x270"
 hint.gsc.0.drq="3"
-device		dgb	1   
+device		dgb	  1
 options		NDGBPORTS=17
 hint.dgb.0.at="isa"
 hint.dgb.0.port="0x220"