Move DPT related options out of i386 specific files

so DPT devices can be used on other PCI (alpha?) machines.

Suggested by: several people

4 files changed, 17 insertions, 16 deletions

diff --git a/sys/conf/files b/sys/conf/files
index 31cd9b0046a9..b16d8fd26a3e 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -31,6 +31,8 @@ ddb/db_variables.c	optional ddb
 ddb/db_watch.c		optional ddb
 ddb/db_write_cmd.c	optional ddb
 dev/ccd/ccd.c		optional ccd device-driver
+dev/dpt/dpt_control.c	optional dpt device-driver
+dev/dpt/dpt_scsi.c	optional dpt device-driver
 dev/en/midway.c		optional en device-driver
 dev/pdq/pdq.c		optional fea device-driver
 dev/pdq/pdq_ifsubr.c	optional fea device-driver
@@ -362,6 +364,7 @@ pci/aic7870.c		optional ahc device-driver			\
 	dependency	"aic7xxx_reg.h $S/pci/aic7870.c"
 pci/brooktree848.c	optional bktr device-driver
 pci/bt9xx.c		optional bt device-driver
+pci/dpt_pci.c		optional dpt device-driver
 pci/cy_pci.c		optional cy device-driver
 pci/if_de.c		optional de device-driver
 pci/if_ed_p.c		optional ed device-driver
@@ -447,4 +450,3 @@ vm/vm_pager.c		standard
 vm/vm_swap.c		standard
 vm/vm_unix.c		standard
 vm/vnode_pager.c	standard
-vm/vm_zone.c		standard
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index abd7ef8144a7..93778183ba2c 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.186 1998/01/16 22:13:00 pst Exp $
+#	$Id: files.i386,v 1.187 1998/01/26 06:11:14 julian Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -313,6 +313,3 @@ gnu/i386/fpemul/wm_sqrt.s	optional	gpl_math_emulate
 gnu/i386/isa/dgb.c		optional	dgb	device-driver
 gnu/i386/isa/sound/awe_wave.c	optional	awe	device-driver
 pci/ide_pci.c			optional	wd	device-driver
-dev/dpt/dpt_control.c		optional        dpt	device-driver
-dev/dpt/dpt_scsi.c		optional        dpt	device-driver
-pci/dpt_pci.c			optional        dpt	device-driver
diff --git a/sys/conf/options b/sys/conf/options
index 203ad6feba12..0f24d1e9fc2a 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,4 +1,4 @@
-#	$Id: options,v 1.48 1998/01/25 04:13:23 eivind Exp $
+#	$Id: options,v 1.49 1998/01/25 04:23:29 eivind Exp $
 
 # Format:
 # Option name	filename
@@ -137,3 +137,14 @@ PPP_DEFLATE		opt_ppp.h
 PPP_FILTER		opt_ppp.h
 TCP_COMPAT_42		opt_compat.h
 TCPDEBUG
+
+# DPT driver debug flags
+DPT_VERIFY_HINTR        opt_dpt.h
+DPT_USE_SINTR           opt_dpt.h
+DPT_RESTRICTED_FREELIST opt_dpt.h
+DPT_MEASURE_PERFORMANCE opt_dpt.h
+DPT_FREELIST_IS_STACK   opt_dpt.h
+DPT_HANDLE_TIMEOUTS     opt_dpt.h
+DPT_TIMEOUT_FACTOR      opt_dpt.h
+DPT_INTR_DELAY		opt_dpt.h
+DPT_LOST_IRQ		opt_dpt.h
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 00658d38882b..b525e8b556ef 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -1,4 +1,4 @@
-#	$Id: options.i386,v 1.67 1998/01/25 04:37:47 eivind Exp $
+#	$Id: options.i386,v 1.68 1998/01/26 06:11:14 julian Exp $
 
 BOUNCEPAGES		opt_bounce.h
 USER_LDT
@@ -114,12 +114,3 @@ PCVT_SCANSET		opt_pcvt.h
 PCVT_SCREENSAVER	opt_pcvt.h
 PCVT_USEKBDSEC		opt_pcvt.h
 PCVT_VT220KEYB		opt_pcvt.h
-DPT_VERIFY_HINTR        opt_dpt.h
-DPT_USE_SINTR           opt_dpt.h
-DPT_RESTRICTED_FREELIST opt_dpt.h
-DPT_MEASURE_PERFORMANCE opt_dpt.h
-DPT_FREELIST_IS_STACK   opt_dpt.h
-DPT_HANDLE_TIMEOUTS     opt_dpt.h
-DPT_TIMEOUT_FACTOR      opt_dpt.h
-DPT_INTR_DELAY		opt_dpt.h
-DPT_LOST_IRQ		opt_dpt.h