The puc(4) driver/bridge is MI, so don't bury it in MD options and files

config files.  It also depends on PCI.

7 files changed, 6 insertions, 11 deletions

diff --git a/sys/conf/files b/sys/conf/files
index e27d638..222888c 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -501,6 +501,8 @@ dev/ppbus/ppi.c		optional ppi
 dev/ppbus/pps.c		optional pps
 dev/ppbus/vpo.c		optional vpo
 dev/ppbus/vpoio.c	optional vpo
+dev/puc/puc.c		optional puc pci
+dev/puc/pucdata.c	optional puc pci
 dev/random/harvest.c	standard
 dev/random/randomdev.c	optional random
 dev/random/yarrow.c	optional random
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 3bbbb37..06ad646 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -20,7 +20,7 @@ dev/sio/sio_isa.c		optional	sio isa
 dev/sio/sio_pccard.c		optional	sio card
 dev/sio/sio_pccard.c		optional	sio pccard
 dev/sio/sio_pci.c		optional	sio pci
-dev/sio/sio_puc.c		optional	sio puc
+dev/sio/sio_puc.c		optional	sio puc pci
 dev/syscons/apm/apm_saver.c	optional	apm_saver apm
 dev/syscons/schistory.c		count		sc
 dev/syscons/scmouse.c		optional	sc
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 8744e1f..d7a96f1 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -120,8 +120,6 @@ dev/kbd/kbd.c			optional	sc
 dev/kbd/kbd.c			optional	ukbd
 dev/kbd/kbd.c			optional	vt
 dev/lnc/if_lnc_isa.c		optional	lnc isa
-dev/puc/puc.c			optional	puc
-dev/puc/pucdata.c		optional	puc
 dev/sbni/if_sbni.c		optional	sbni
 dev/sbni/if_sbni_isa.c		optional	sbni isa
 dev/sbni/if_sbni_pci.c		optional	sbni pci
@@ -130,7 +128,7 @@ dev/sio/sio_isa.c		optional	sio isa
 dev/sio/sio_pccard.c		optional	sio card
 dev/sio/sio_pccard.c		optional	sio pccard
 dev/sio/sio_pci.c		optional	sio pci
-dev/sio/sio_puc.c		optional	sio puc
+dev/sio/sio_puc.c		optional	sio puc pci
 dev/sr/if_sr_isa.c		optional	sr isa
 dev/syscons/apm/apm_saver.c	optional	apm_saver apm
 dev/syscons/schistory.c		count		sc
diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98
index c3f3d13..6575722 100644
--- a/sys/conf/files.pc98
+++ b/sys/conf/files.pc98
@@ -114,15 +114,13 @@ dev/kbd/kbd.c			optional	sc
 dev/kbd/kbd.c			optional	ukbd
 dev/kbd/kbd.c			count		pckbd
 dev/lnc/if_lnc_cbus.c		optional	lnc isa
-dev/puc/puc.c			optional	puc
-dev/puc/pucdata.c		optional	puc
 dev/sbni/if_sbni.c		optional	sbni
 dev/sbni/if_sbni_isa.c		optional	sbni isa
 dev/sbni/if_sbni_pci.c		optional	sbni pci
 dev/sio/sio_pccard.c		optional	sio card
 dev/sio/sio_pccard.c		optional	sio pccard
 dev/sio/sio_pci.c		optional	sio pci
-dev/sio/sio_puc.c		optional	sio puc
+dev/sio/sio_puc.c		optional	sio puc pci
 dev/snc/dp83932.c		optional	snc
 dev/snc/dp83932subr.c		optional	snc
 dev/snc/if_snc.c		optional	snc
diff --git a/sys/conf/options b/sys/conf/options
index 28aa2c2..077f1db 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -86,6 +86,7 @@ NODEVFS		opt_devfs.h
 NTIMECOUNTER	opt_ntp.h
 NSWAPDEV	opt_swap.h
 PPS_SYNC	opt_ntp.h
+PUC_FASTINTR	opt_puc.h
 QUOTA
 SPX_HACK
 SUIDDIR		opt_suiddir.h
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index da47c41..036e4c1 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -105,8 +105,6 @@ PSM_HOOKRESUME		opt_psm.h
 PSM_RESETAFTERSUSPEND	opt_psm.h
 PSM_DEBUG		opt_psm.h
 
-PUC_FASTINTR		opt_puc.h
-
 ATKBD_DFLT_KEYMAP	opt_atkbd.h
 
 KBD_DISABLE_KEYMAP_LOAD	opt_kbd.h
diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98
index 7e2aa06..c062d8f 100644
--- a/sys/conf/options.pc98
+++ b/sys/conf/options.pc98
@@ -93,8 +93,6 @@ SC_TWOBUTTON_MOUSE	opt_syscons.h
 
 GDC			opt_gdc.h
 
-PUC_FASTINTR		opt_puc.h
-
 KBD_DISABLE_KEYMAP_LOAD	opt_kbd.h
 KBD_INSTALL_CDEV	opt_kbd.h
 KBD_MAXRETRY		opt_kbd.h