diff options
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/NOTES | 9 | ||||
| -rw-r--r-- | sys/conf/files | 7 | ||||
| -rw-r--r-- | sys/conf/kmod.mk | 4 | ||||
| -rw-r--r-- | sys/conf/options | 1 |
4 files changed, 6 insertions, 15 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 1e4c64c..7ef2e6f 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1689,15 +1689,8 @@ options ALT_BREAK_TO_DEBUGGER device scc # PCI Universal Communications driver -# Supports various single and multi port PCI serial cards. Maybe later -# also the parallel ports on combination serial/parallel cards. New cards -# can be added in src/sys/dev/puc/pucdata.c. -# -# If the PUC_FASTINTR option is used the driver will try to use fast -# interrupts. The card must then be the only user of that interrupt. -# Interrupts cannot be shared when using PUC_FASTINTR. +# Supports various multi port PCI I/O cards. device puc -options PUC_FASTINTR # # Network interfaces: diff --git a/sys/conf/files b/sys/conf/files index 71e475b..922a84c 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -805,10 +805,9 @@ dev/pst/pst-iop.c optional pst dev/pst/pst-pci.c optional pst pci dev/pst/pst-raid.c optional pst dev/puc/puc.c optional puc -dev/puc/puc_ebus.c optional puc ebus +dev/puc/puc_cfg.c optional puc dev/puc/puc_pccard.c optional puc pccard dev/puc/puc_pci.c optional puc pci -dev/puc/puc_sbus.c optional puc fhc | puc sbus dev/puc/pucdata.c optional puc pci dev/ral/rt2560.c optional ral dev/ral/rt2661.c optional ral @@ -845,7 +844,7 @@ dev/si/si_isa.c optional si isa dev/si/si_pci.c optional si pci dev/sio/sio_pccard.c optional sio pccard dev/sio/sio_pci.c optional sio pci -dev/sio/sio_puc.c optional sio puc pci +dev/sio/sio_puc.c optional sio puc dev/sk/if_sk.c optional sk pci dev/smbus/smb.c optional smb dev/smbus/smbconf.c optional smbus @@ -1321,7 +1320,7 @@ kern/md4c.c optional netsmb kern/md5c.c standard kern/sched_4bsd.c optional sched_4bsd kern/sched_ule.c optional sched_ule -kern/serdev_if.m optional scc +kern/serdev_if.m optional puc | scc kern/subr_autoconf.c standard kern/subr_blist.c standard kern/subr_bus.c standard diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index b4d7a70..506a73d 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -321,8 +321,8 @@ MFILES?= dev/acpica/acpi_if.m dev/ata/ata_if.m dev/eisa/eisa_if.m \ dev/pci/pcib_if.m dev/ppbus/ppbus_if.m dev/smbus/smbus_if.m \ dev/sound/pcm/ac97_if.m dev/sound/pcm/channel_if.m \ dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m \ - dev/usb/usb_if.m isa/isa_if.m \ - kern/bus_if.m kern/cpufreq_if.m kern/device_if.m \ + dev/usb/usb_if.m isa/isa_if.m kern/bus_if.m kern/cpufreq_if.m \ + kern/device_if.m kern/serdev_if.m \ libkern/iconv_converter_if.m opencrypto/crypto_if.m \ pc98/pc98/canbus_if.m pci/agp_if.m diff --git a/sys/conf/options b/sys/conf/options index 0833390..33b5661 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -125,7 +125,6 @@ PPC_DEBUG opt_ppc.h PPC_PROBE_CHIPSET opt_ppc.h PPS_SYNC opt_ntp.h PREEMPTION opt_sched.h -PUC_FASTINTR opt_puc.h QUOTA SCHED_4BSD opt_sched.h SCHED_ULE opt_sched.h |
