aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2005-01-30 01:00:13 +0000
committerWarner Losh <imp@FreeBSD.org>2005-01-30 01:00:13 +0000
commit5b26fb70440bc9195e03e23a989271f9c8ad1cb4 (patch)
treef9cabdc9d71053f9e49e546a0b18854dd7f18a5b
parentbc57bbf9bba782d5c6f47bebcec68b74f1c4da46 (diff)
Notes
-rw-r--r--sys/alpha/alpha/busdma_machdep.c2
-rw-r--r--sys/alpha/alpha/clock.c2
-rw-r--r--sys/alpha/alpha/clock_if.m2
-rw-r--r--sys/alpha/alpha/cpuconf.c2
-rw-r--r--sys/alpha/alpha/db_disasm.c2
-rw-r--r--sys/alpha/alpha/db_instruction.h2
-rw-r--r--sys/alpha/alpha/db_interface.c2
-rw-r--r--sys/alpha/alpha/dec_1000a.c8
-rw-r--r--sys/alpha/alpha/dec_2100_a50.c6
-rw-r--r--sys/alpha/alpha/dec_2100_a500.c2
-rw-r--r--sys/alpha/alpha/dec_3000_300.c2
-rw-r--r--sys/alpha/alpha/dec_3000_500.c2
-rw-r--r--sys/alpha/alpha/dec_axppci_33.c4
-rw-r--r--sys/alpha/alpha/dec_eb164.c4
-rw-r--r--sys/alpha/alpha/dec_eb64plus.c4
-rw-r--r--sys/alpha/alpha/dec_kn20aa.c4
-rw-r--r--sys/alpha/alpha/dec_kn300.c2
-rw-r--r--sys/alpha/alpha/dec_kn8ae.c2
-rw-r--r--sys/alpha/alpha/dec_st550.c6
-rw-r--r--sys/alpha/alpha/divrem.m42
-rw-r--r--sys/alpha/alpha/exception.s2
-rw-r--r--sys/alpha/alpha/gdb_machdep.c2
-rw-r--r--sys/alpha/alpha/in_cksum.c2
-rw-r--r--sys/alpha/alpha/interrupt.c4
-rw-r--r--sys/alpha/alpha/locore.s2
-rw-r--r--sys/alpha/alpha/machdep.c2
-rw-r--r--sys/alpha/alpha/pal.s2
-rw-r--r--sys/alpha/alpha/pmap.c2
-rw-r--r--sys/alpha/alpha/prom.c2
-rw-r--r--sys/alpha/alpha/prom_disp.s2
-rw-r--r--sys/alpha/alpha/promcons.c2
-rw-r--r--sys/alpha/alpha/support.s2
-rw-r--r--sys/alpha/alpha/trap.c2
-rw-r--r--sys/alpha/alpha/uio_machdep.c2
-rw-r--r--sys/alpha/alpha/vm_machdep.c2
-rw-r--r--sys/alpha/include/_limits.h2
-rw-r--r--sys/alpha/include/alpha_cpu.h2
-rw-r--r--sys/alpha/include/asm.h2
-rw-r--r--sys/alpha/include/bootinfo.h2
-rw-r--r--sys/alpha/include/bus.h2
-rw-r--r--sys/alpha/include/bus_memio.h2
-rw-r--r--sys/alpha/include/bus_pio.h2
-rw-r--r--sys/alpha/include/clock.h2
-rw-r--r--sys/alpha/include/clockvar.h2
-rw-r--r--sys/alpha/include/cpu.h2
-rw-r--r--sys/alpha/include/cpuconf.h4
-rw-r--r--sys/alpha/include/db_machdep.h2
-rw-r--r--sys/alpha/include/exec.h2
-rw-r--r--sys/alpha/include/float.h2
-rw-r--r--sys/alpha/include/floatingpoint.h2
-rw-r--r--sys/alpha/include/frame.h2
-rw-r--r--sys/alpha/include/gdb_machdep.h2
-rw-r--r--sys/alpha/include/ieee.h2
-rw-r--r--sys/alpha/include/ieeefp.h2
-rw-r--r--sys/alpha/include/intrcnt.h2
-rw-r--r--sys/alpha/include/kdb.h2
-rw-r--r--sys/alpha/include/limits.h2
-rw-r--r--sys/alpha/include/pal.h2
-rw-r--r--sys/alpha/include/param.h3
-rw-r--r--sys/alpha/include/pcb.h2
-rw-r--r--sys/alpha/include/pmap.h2
-rw-r--r--sys/alpha/include/proc.h2
-rw-r--r--sys/alpha/include/profile.h2
-rw-r--r--sys/alpha/include/prom.h2
-rw-r--r--sys/alpha/include/pte.h2
-rw-r--r--sys/alpha/include/ptrace.h2
-rw-r--r--sys/alpha/include/reg.h2
-rw-r--r--sys/alpha/include/reloc.h2
-rw-r--r--sys/alpha/include/resource.h2
-rw-r--r--sys/alpha/include/rpb.h2
-rw-r--r--sys/alpha/include/runq.h2
-rw-r--r--sys/alpha/include/signal.h2
-rw-r--r--sys/alpha/include/smp.h2
-rw-r--r--sys/alpha/include/vmparam.h2
-rw-r--r--sys/alpha/isa/mcclock_isa.c2
-rw-r--r--sys/alpha/mcbus/mcbus.c2
-rw-r--r--sys/alpha/mcbus/mcbusreg.h2
-rw-r--r--sys/alpha/mcbus/mcbusvar.h2
-rw-r--r--sys/alpha/mcbus/mcmem.c2
-rw-r--r--sys/alpha/mcbus/mcpcia.c2
-rw-r--r--sys/alpha/mcbus/mcpciareg.h2
-rw-r--r--sys/alpha/mcbus/mcpciavar.h2
-rw-r--r--sys/alpha/osf1/exec_ecoff.h2
-rw-r--r--sys/alpha/osf1/imgact_osf1.c2
-rw-r--r--sys/alpha/osf1/osf1.h2
-rw-r--r--sys/alpha/osf1/osf1_ioctl.c2
-rw-r--r--sys/alpha/osf1/osf1_misc.c2
-rw-r--r--sys/alpha/osf1/osf1_mount.c2
-rw-r--r--sys/alpha/osf1/osf1_signal.c2
-rw-r--r--sys/alpha/pci/alphapci_if.m2
-rw-r--r--sys/alpha/pci/apecs.c4
-rw-r--r--sys/alpha/pci/apecsreg.h2
-rw-r--r--sys/alpha/pci/cia.c2
-rw-r--r--sys/alpha/pci/cia_pci.c2
-rw-r--r--sys/alpha/pci/ciareg.h2
-rw-r--r--sys/alpha/pci/lcareg.h2
-rw-r--r--sys/alpha/pci/pci_eb164_intr.s2
-rw-r--r--sys/alpha/pci/pci_eb64plus_intr.s2
-rw-r--r--sys/alpha/pci/pcibus.c2
-rw-r--r--sys/alpha/pci/t2.c2
-rw-r--r--sys/alpha/pci/t2reg.h2
-rw-r--r--sys/alpha/tlsb/dwlpx.c2
-rw-r--r--sys/alpha/tlsb/dwlpxreg.h2
-rw-r--r--sys/alpha/tlsb/dwlpxvar.h2
-rw-r--r--sys/alpha/tlsb/gbus.c2
-rw-r--r--sys/alpha/tlsb/kftxx.c2
-rw-r--r--sys/alpha/tlsb/kftxxreg.h2
-rw-r--r--sys/alpha/tlsb/mcclock_tlsb.c2
-rw-r--r--sys/alpha/tlsb/tlsb.c2
-rw-r--r--sys/alpha/tlsb/tlsbcpu.c2
-rw-r--r--sys/alpha/tlsb/tlsbmem.c2
-rw-r--r--sys/alpha/tlsb/tlsbreg.h2
-rw-r--r--sys/alpha/tlsb/tlsbvar.h2
-rw-r--r--sys/amd64/amd64/busdma_machdep.c2
-rw-r--r--sys/amd64/amd64/db_disasm.c2
-rw-r--r--sys/amd64/amd64/db_interface.c2
-rw-r--r--sys/amd64/amd64/db_trace.c2
-rw-r--r--sys/amd64/amd64/gdb_machdep.c2
-rw-r--r--sys/amd64/amd64/in_cksum.c2
-rw-r--r--sys/amd64/amd64/nexus.c2
-rw-r--r--sys/amd64/amd64/uio_machdep.c2
-rw-r--r--sys/amd64/include/_limits.h2
-rw-r--r--sys/amd64/include/apicreg.h2
-rw-r--r--sys/amd64/include/bus_amd64.h2
-rw-r--r--sys/amd64/include/bus_dma.h2
-rw-r--r--sys/amd64/include/bus_memio.h2
-rw-r--r--sys/amd64/include/bus_pio.h2
-rw-r--r--sys/amd64/include/clock.h2
-rw-r--r--sys/amd64/include/cputypes.h2
-rw-r--r--sys/amd64/include/db_machdep.h2
-rw-r--r--sys/amd64/include/float.h2
-rw-r--r--sys/amd64/include/gdb_machdep.h2
-rw-r--r--sys/amd64/include/kdb.h2
-rw-r--r--sys/amd64/include/limits.h2
-rw-r--r--sys/amd64/include/metadata.h2
-rw-r--r--sys/amd64/include/mptable.h2
-rw-r--r--sys/amd64/include/param.h2
-rw-r--r--sys/amd64/include/pci_cfgreg.h2
-rw-r--r--sys/amd64/include/pmap.h2
-rw-r--r--sys/amd64/include/proc.h2
-rw-r--r--sys/amd64/include/profile.h2
-rw-r--r--sys/amd64/include/ptrace.h2
-rw-r--r--sys/amd64/include/resource.h2
-rw-r--r--sys/amd64/include/runq.h2
-rw-r--r--sys/amd64/include/signal.h2
-rw-r--r--sys/amd64/include/smp.h2
-rw-r--r--sys/amd64/isa/isa.c2
-rw-r--r--sys/amd64/pci/pci_bus.c2
-rw-r--r--sys/amd64/pci/pci_cfgreg.c2
-rw-r--r--sys/boot/efi/include/README3
-rw-r--r--sys/boot/efi/libefi/efiboot.h2
-rw-r--r--sys/boot/efi/libefi/time.c2
-rw-r--r--sys/boot/ofw/libofw/libofw.h2
-rw-r--r--sys/boot/ofw/libofw/ofw_console.c2
-rw-r--r--sys/boot/ofw/libofw/ofw_disk.c2
-rw-r--r--sys/boot/ofw/libofw/ofw_memory.c2
-rw-r--r--sys/boot/ofw/libofw/ofw_net.c2
-rw-r--r--sys/boot/ofw/libofw/ofw_reboot.c2
-rw-r--r--sys/boot/ofw/libofw/ofw_time.c2
-rw-r--r--sys/boot/ofw/libofw/openfirm.c4
-rw-r--r--sys/boot/ofw/libofw/openfirm.h4
-rw-r--r--sys/boot/sparc64/boot1/boot1.c2
-rw-r--r--sys/boot/sparc64/loader/locore.S2
-rw-r--r--sys/boot/sparc64/loader/main.c2
-rw-r--r--sys/cam/cam.c2
-rw-r--r--sys/cam/cam.h2
-rw-r--r--sys/cam/cam_ccb.h2
-rw-r--r--sys/cam/cam_debug.h2
-rw-r--r--sys/cam/cam_periph.c2
-rw-r--r--sys/cam/cam_periph.h2
-rw-r--r--sys/cam/cam_queue.c2
-rw-r--r--sys/cam/cam_queue.h2
-rw-r--r--sys/cam/cam_sim.c2
-rw-r--r--sys/cam/cam_sim.h2
-rw-r--r--sys/cam/cam_xpt.c2
-rw-r--r--sys/cam/cam_xpt.h2
-rw-r--r--sys/cam/cam_xpt_periph.h2
-rw-r--r--sys/cam/cam_xpt_sim.h2
-rw-r--r--sys/cam/scsi/scsi_all.c2
-rw-r--r--sys/cam/scsi/scsi_all.h2
-rw-r--r--sys/cam/scsi/scsi_cd.c4
-rw-r--r--sys/cam/scsi/scsi_ch.c4
-rw-r--r--sys/cam/scsi/scsi_ch.h4
-rw-r--r--sys/cam/scsi/scsi_da.c2
-rw-r--r--sys/cam/scsi/scsi_da.h4
-rw-r--r--sys/cam/scsi/scsi_dvcfg.h2
-rw-r--r--sys/cam/scsi/scsi_iu.h2
-rw-r--r--sys/cam/scsi/scsi_low.c2
-rw-r--r--sys/cam/scsi/scsi_low.h2
-rw-r--r--sys/cam/scsi/scsi_low_pisa.c2
-rw-r--r--sys/cam/scsi/scsi_low_pisa.h2
-rw-r--r--sys/cam/scsi/scsi_message.h2
-rw-r--r--sys/cam/scsi/scsi_pass.c2
-rw-r--r--sys/cam/scsi/scsi_pass.h2
-rw-r--r--sys/cam/scsi/scsi_pt.c2
-rw-r--r--sys/cam/scsi/scsi_pt.h2
-rw-r--r--sys/cam/scsi/scsi_sa.c2
-rw-r--r--sys/cam/scsi/scsi_sa.h2
-rw-r--r--sys/cam/scsi/scsi_ses.c2
-rw-r--r--sys/cam/scsi/scsi_ses.h2
-rw-r--r--sys/cam/scsi/scsi_targ_bh.c2
-rw-r--r--sys/cam/scsi/scsi_target.c2
-rw-r--r--sys/cam/scsi/scsi_targetio.h2
-rw-r--r--sys/coda/cnode.h4
-rw-r--r--sys/coda/coda.h2
-rw-r--r--sys/coda/coda_fbsd.c2
-rw-r--r--sys/coda/coda_io.h4
-rw-r--r--sys/coda/coda_kernel.h2
-rw-r--r--sys/coda/coda_namecache.c4
-rw-r--r--sys/coda/coda_namecache.h4
-rw-r--r--sys/coda/coda_opstats.h2
-rw-r--r--sys/coda/coda_pioctl.h4
-rw-r--r--sys/coda/coda_psdev.c4
-rw-r--r--sys/coda/coda_psdev.h2
-rw-r--r--sys/coda/coda_subr.c4
-rw-r--r--sys/coda/coda_subr.h2
-rw-r--r--sys/coda/coda_venus.c2
-rw-r--r--sys/coda/coda_venus.h2
-rw-r--r--sys/coda/coda_vfsops.c4
-rw-r--r--sys/coda/coda_vfsops.h2
-rw-r--r--sys/coda/coda_vnops.c2
-rw-r--r--sys/coda/coda_vnops.h2
-rw-r--r--sys/compat/linprocfs/linprocfs.c2
-rw-r--r--sys/compat/linux/linux_ioctl.c2
-rw-r--r--sys/compat/linux/linux_ioctl.h2
-rw-r--r--sys/compat/linux/linux_util.c2
-rw-r--r--sys/compat/linux/linux_util.h2
-rw-r--r--sys/compat/ndis/cfg_var.h2
-rw-r--r--sys/compat/ndis/subr_pe.c2
-rw-r--r--sys/compat/netbsd/dvcfg.h2
-rw-r--r--sys/compat/netbsd/physio_proc.h2
-rw-r--r--sys/compat/pecoff/imgact_pecoff.c2
-rw-r--r--sys/compat/pecoff/imgact_pecoff.h2
-rw-r--r--sys/compat/svr4/svr4.h2
-rw-r--r--sys/compat/svr4/svr4_acl.h2
-rw-r--r--sys/compat/svr4/svr4_dirent.h2
-rw-r--r--sys/compat/svr4/svr4_errno.h2
-rw-r--r--sys/compat/svr4/svr4_exec.h2
-rw-r--r--sys/compat/svr4/svr4_fcntl.c2
-rw-r--r--sys/compat/svr4/svr4_fcntl.h2
-rw-r--r--sys/compat/svr4/svr4_filio.c2
-rw-r--r--sys/compat/svr4/svr4_filio.h2
-rw-r--r--sys/compat/svr4/svr4_fuser.h2
-rw-r--r--sys/compat/svr4/svr4_hrt.h2
-rw-r--r--sys/compat/svr4/svr4_ioctl.c2
-rw-r--r--sys/compat/svr4/svr4_ioctl.h2
-rw-r--r--sys/compat/svr4/svr4_ipc.c2
-rw-r--r--sys/compat/svr4/svr4_ipc.h2
-rw-r--r--sys/compat/svr4/svr4_misc.c2
-rw-r--r--sys/compat/svr4/svr4_mman.h2
-rw-r--r--sys/compat/svr4/svr4_resource.c3
-rw-r--r--sys/compat/svr4/svr4_resource.h2
-rw-r--r--sys/compat/svr4/svr4_siginfo.h2
-rw-r--r--sys/compat/svr4/svr4_signal.c2
-rw-r--r--sys/compat/svr4/svr4_signal.h2
-rw-r--r--sys/compat/svr4/svr4_socket.c2
-rw-r--r--sys/compat/svr4/svr4_socket.h2
-rw-r--r--sys/compat/svr4/svr4_sockio.c2
-rw-r--r--sys/compat/svr4/svr4_sockio.h2
-rw-r--r--sys/compat/svr4/svr4_sockmod.h2
-rw-r--r--sys/compat/svr4/svr4_stat.c2
-rw-r--r--sys/compat/svr4/svr4_stat.h2
-rw-r--r--sys/compat/svr4/svr4_statvfs.h2
-rw-r--r--sys/compat/svr4/svr4_stream.c2
-rw-r--r--sys/compat/svr4/svr4_stropts.h2
-rw-r--r--sys/compat/svr4/svr4_sysconfig.h2
-rw-r--r--sys/compat/svr4/svr4_systeminfo.h2
-rw-r--r--sys/compat/svr4/svr4_sysvec.c2
-rw-r--r--sys/compat/svr4/svr4_termios.c2
-rw-r--r--sys/compat/svr4/svr4_termios.h2
-rw-r--r--sys/compat/svr4/svr4_time.h2
-rw-r--r--sys/compat/svr4/svr4_timod.h2
-rw-r--r--sys/compat/svr4/svr4_ttold.c2
-rw-r--r--sys/compat/svr4/svr4_ttold.h2
-rw-r--r--sys/compat/svr4/svr4_types.h2
-rw-r--r--sys/compat/svr4/svr4_ucontext.h2
-rw-r--r--sys/compat/svr4/svr4_ulimit.h2
-rw-r--r--sys/compat/svr4/svr4_ustat.h2
-rw-r--r--sys/compat/svr4/svr4_util.h2
-rw-r--r--sys/compat/svr4/svr4_utsname.h2
-rw-r--r--sys/compat/svr4/svr4_wait.h2
-rw-r--r--sys/ddb/db_access.c2
-rw-r--r--sys/ddb/db_access.h2
-rw-r--r--sys/ddb/db_break.c2
-rw-r--r--sys/ddb/db_break.h2
-rw-r--r--sys/ddb/db_command.c2
-rw-r--r--sys/ddb/db_command.h2
-rw-r--r--sys/ddb/db_examine.c2
-rw-r--r--sys/ddb/db_expr.c2
-rw-r--r--sys/ddb/db_input.c2
-rw-r--r--sys/ddb/db_lex.c2
-rw-r--r--sys/ddb/db_lex.h2
-rw-r--r--sys/ddb/db_main.c2
-rw-r--r--sys/ddb/db_output.c2
-rw-r--r--sys/ddb/db_output.h2
-rw-r--r--sys/ddb/db_print.c2
-rw-r--r--sys/ddb/db_run.c2
-rw-r--r--sys/ddb/db_sym.c2
-rw-r--r--sys/ddb/db_sym.h2
-rw-r--r--sys/ddb/db_thread.c2
-rw-r--r--sys/ddb/db_variables.c2
-rw-r--r--sys/ddb/db_variables.h2
-rw-r--r--sys/ddb/db_watch.c2
-rw-r--r--sys/ddb/db_watch.h2
-rw-r--r--sys/ddb/db_write_cmd.c2
-rw-r--r--sys/ddb/ddb.h2
-rw-r--r--sys/dev/aac/aac_cam.c2
-rw-r--r--sys/dev/acpica/acpi_ec.c3
-rw-r--r--sys/dev/acpica/acpi_pci.c2
-rw-r--r--sys/dev/adlink/adlink.c2
-rw-r--r--sys/dev/advansys/adv_eisa.c2
-rw-r--r--sys/dev/advansys/adv_isa.c2
-rw-r--r--sys/dev/advansys/adv_pci.c2
-rw-r--r--sys/dev/advansys/advansys.c4
-rw-r--r--sys/dev/advansys/advansys.h2
-rw-r--r--sys/dev/advansys/advlib.c4
-rw-r--r--sys/dev/advansys/advlib.h4
-rw-r--r--sys/dev/advansys/advmcode.c2
-rw-r--r--sys/dev/advansys/advmcode.h2
-rw-r--r--sys/dev/advansys/adw_pci.c2
-rw-r--r--sys/dev/advansys/adwcam.c2
-rw-r--r--sys/dev/advansys/adwlib.c4
-rw-r--r--sys/dev/advansys/adwlib.h4
-rw-r--r--sys/dev/advansys/adwmcode.c2
-rw-r--r--sys/dev/advansys/adwmcode.h2
-rw-r--r--sys/dev/advansys/adwvar.h2
-rw-r--r--sys/dev/aha/aha.c17
-rw-r--r--sys/dev/aha/aha_isa.c3
-rw-r--r--sys/dev/aha/ahareg.h2
-rw-r--r--sys/dev/ahb/ahb.c2
-rw-r--r--sys/dev/ahb/ahbreg.h2
-rw-r--r--sys/dev/aic/aic6360reg.h2
-rw-r--r--sys/dev/aic7xxx/ahc_eisa.c2
-rw-r--r--sys/dev/aic7xxx/ahc_isa.c2
-rw-r--r--sys/dev/aic7xxx/ahc_pci.c2
-rw-r--r--sys/dev/aic7xxx/ahd_pci.c2
-rw-r--r--sys/dev/aic7xxx/aic7770.c2
-rw-r--r--sys/dev/aic7xxx/aic79xx.c2
-rw-r--r--sys/dev/aic7xxx/aic79xx.h2
-rw-r--r--sys/dev/aic7xxx/aic79xx.reg2
-rw-r--r--sys/dev/aic7xxx/aic79xx.seq2
-rw-r--r--sys/dev/aic7xxx/aic79xx_inline.h2
-rw-r--r--sys/dev/aic7xxx/aic79xx_osm.c2
-rw-r--r--sys/dev/aic7xxx/aic79xx_osm.h2
-rw-r--r--sys/dev/aic7xxx/aic79xx_pci.c2
-rw-r--r--sys/dev/aic7xxx/aic7xxx.c2
-rw-r--r--sys/dev/aic7xxx/aic7xxx.h2
-rw-r--r--sys/dev/aic7xxx/aic7xxx.reg2
-rw-r--r--sys/dev/aic7xxx/aic7xxx.seq2
-rw-r--r--sys/dev/aic7xxx/aic7xxx_93cx6.c2
-rw-r--r--sys/dev/aic7xxx/aic7xxx_93cx6.h2
-rw-r--r--sys/dev/aic7xxx/aic7xxx_inline.h2
-rw-r--r--sys/dev/aic7xxx/aic7xxx_osm.c2
-rw-r--r--sys/dev/aic7xxx/aic7xxx_osm.h2
-rw-r--r--sys/dev/aic7xxx/aic7xxx_pci.c2
-rw-r--r--sys/dev/aic7xxx/aic_osm_lib.c2
-rw-r--r--sys/dev/aic7xxx/aic_osm_lib.h2
-rw-r--r--sys/dev/aic7xxx/aicasm/aicasm.c2
-rw-r--r--sys/dev/aic7xxx/aicasm/aicasm.h2
-rw-r--r--sys/dev/aic7xxx/aicasm/aicasm_gram.y2
-rw-r--r--sys/dev/aic7xxx/aicasm/aicasm_insformat.h2
-rw-r--r--sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y2
-rw-r--r--sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l2
-rw-r--r--sys/dev/aic7xxx/aicasm/aicasm_scan.l2
-rw-r--r--sys/dev/aic7xxx/aicasm/aicasm_symbol.c2
-rw-r--r--sys/dev/aic7xxx/aicasm/aicasm_symbol.h2
-rw-r--r--sys/dev/amd/amd.c2
-rw-r--r--sys/dev/amd/amd.h2
-rw-r--r--sys/dev/amr/amr.c5
-rw-r--r--sys/dev/amr/amr_cam.c2
-rw-r--r--sys/dev/amr/amr_disk.c2
-rw-r--r--sys/dev/amr/amr_pci.c4
-rw-r--r--sys/dev/an/if_aironet_ieee.h2
-rw-r--r--sys/dev/an/if_an.c2
-rw-r--r--sys/dev/an/if_an_isa.c2
-rw-r--r--sys/dev/an/if_an_pccard.c2
-rw-r--r--sys/dev/an/if_anreg.h2
-rw-r--r--sys/dev/ar/if_ar.c2
-rw-r--r--sys/dev/ar/if_ar.h2
-rw-r--r--sys/dev/ar/if_ar_isa.c2
-rw-r--r--sys/dev/ar/if_arregs.h2
-rw-r--r--sys/dev/asr/dptalign.h2
-rw-r--r--sys/dev/asr/dptsig.h2
-rw-r--r--sys/dev/asr/i2oadptr.h3
-rw-r--r--sys/dev/asr/i2obscsi.h3
-rw-r--r--sys/dev/asr/i2odep.h3
-rw-r--r--sys/dev/asr/i2odpt.h3
-rw-r--r--sys/dev/asr/i2oexec.h3
-rw-r--r--sys/dev/asr/i2omsg.h3
-rw-r--r--sys/dev/asr/i2otypes.h3
-rw-r--r--sys/dev/asr/i2outil.h3
-rw-r--r--sys/dev/asr/osd_defs.h2
-rw-r--r--sys/dev/asr/osd_unix.h2
-rw-r--r--sys/dev/asr/osd_util.h2
-rw-r--r--sys/dev/asr/sys_info.h2
-rw-r--r--sys/dev/ath/if_ath.c2
-rw-r--r--sys/dev/ath/if_ath_pci.c2
-rw-r--r--sys/dev/ath/if_athioctl.h2
-rw-r--r--sys/dev/ath/if_athvar.h2
-rw-r--r--sys/dev/auxio/auxio.c2
-rw-r--r--sys/dev/auxio/auxioreg.h2
-rw-r--r--sys/dev/awi/if_awi_pccard.c2
-rw-r--r--sys/dev/bfe/if_bfe.c6
-rw-r--r--sys/dev/bfe/if_bfereg.h5
-rw-r--r--sys/dev/bge/if_bge.c2
-rw-r--r--sys/dev/bge/if_bgereg.h2
-rw-r--r--sys/dev/bktr/bktr_audio.h2
-rw-r--r--sys/dev/bktr/bktr_card.h2
-rw-r--r--sys/dev/bktr/bktr_core.h2
-rw-r--r--sys/dev/bktr/bktr_mem.c2
-rw-r--r--sys/dev/bktr/bktr_mem.h2
-rw-r--r--sys/dev/bktr/bktr_os.h2
-rw-r--r--sys/dev/bktr/bktr_reg.h2
-rw-r--r--sys/dev/bktr/bktr_tuner.h2
-rw-r--r--sys/dev/bktr/ioctl_meteor.h2
-rw-r--r--sys/dev/buslogic/bt.c2
-rw-r--r--sys/dev/buslogic/bt_eisa.c2
-rw-r--r--sys/dev/buslogic/bt_isa.c2
-rw-r--r--sys/dev/buslogic/btreg.h2
-rw-r--r--sys/dev/cardbus/cardbus.c15
-rw-r--r--sys/dev/cardbus/cardbus_cis.c15
-rw-r--r--sys/dev/cardbus/cardbus_cis.h14
-rw-r--r--sys/dev/cardbus/cardbusreg.h14
-rw-r--r--sys/dev/cardbus/cardbusvar.h14
-rw-r--r--sys/dev/cnw/if_cnwioctl.h2
-rw-r--r--sys/dev/cp/cpddk.c2
-rw-r--r--sys/dev/cp/cpddk.h2
-rw-r--r--sys/dev/cp/if_cp.c2
-rw-r--r--sys/dev/cp/ng_cp.h2
-rw-r--r--sys/dev/cs/if_cs.c2
-rw-r--r--sys/dev/cs/if_cs_isa.c2
-rw-r--r--sys/dev/cs/if_cs_pccard.c2
-rw-r--r--sys/dev/cs/if_csreg.h2
-rw-r--r--sys/dev/cs/if_csvar.h2
-rw-r--r--sys/dev/ct/bshw_machdep.c2
-rw-r--r--sys/dev/ct/bshwvar.h2
-rw-r--r--sys/dev/ct/ct.c2
-rw-r--r--sys/dev/ct/ct_isa.c2
-rw-r--r--sys/dev/ct/ct_machdep.h2
-rw-r--r--sys/dev/ct/ctvar.h2
-rw-r--r--sys/dev/ctau/am8530.h2
-rw-r--r--sys/dev/ctau/ctau.c2
-rw-r--r--sys/dev/ctau/ctaureg.h2
-rw-r--r--sys/dev/ctau/ctddk.c2
-rw-r--r--sys/dev/ctau/ctddk.h2
-rw-r--r--sys/dev/ctau/ds2153.h2
-rw-r--r--sys/dev/ctau/hdc64570.h2
-rw-r--r--sys/dev/ctau/if_ct.c2
-rw-r--r--sys/dev/ctau/lxt318.h2
-rw-r--r--sys/dev/ctau/ng_ct.h2
-rw-r--r--sys/dev/cx/cronyxfw.h2
-rw-r--r--sys/dev/cx/csigma.c2
-rw-r--r--sys/dev/cx/cxddk.c2
-rw-r--r--sys/dev/cx/cxddk.h2
-rw-r--r--sys/dev/cx/cxreg.h2
-rw-r--r--sys/dev/cx/if_cx.c2
-rw-r--r--sys/dev/cx/machdep.h2
-rw-r--r--sys/dev/cx/ng_cx.h2
-rw-r--r--sys/dev/cy/cy_pci.c2
-rw-r--r--sys/dev/dcons/dcons.c4
-rw-r--r--sys/dev/dcons/dcons.h4
-rw-r--r--sys/dev/dcons/dcons_crom.c2
-rw-r--r--sys/dev/dec/mc146818reg.h2
-rw-r--r--sys/dev/dec/mcclock.c2
-rw-r--r--sys/dev/dec/mcclock_if.m2
-rw-r--r--sys/dev/dec/mcclockvar.h2
-rw-r--r--sys/dev/dpt/dpt.h2
-rw-r--r--sys/dev/dpt/dpt_scsi.c2
-rw-r--r--sys/dev/drm/ati_pcigart.h4
-rw-r--r--sys/dev/drm/drm.h2
-rw-r--r--sys/dev/drm/drmP.h4
-rw-r--r--sys/dev/drm/drm_agpsupport.h4
-rw-r--r--sys/dev/drm/drm_auth.h4
-rw-r--r--sys/dev/drm/drm_bufs.h4
-rw-r--r--sys/dev/drm/drm_context.h4
-rw-r--r--sys/dev/drm/drm_dma.h4
-rw-r--r--sys/dev/drm/drm_drawable.h4
-rw-r--r--sys/dev/drm/drm_drv.h4
-rw-r--r--sys/dev/drm/drm_fops.h4
-rw-r--r--sys/dev/drm/drm_ioctl.h4
-rw-r--r--sys/dev/drm/drm_irq.h4
-rw-r--r--sys/dev/drm/drm_linux_list.h4
-rw-r--r--sys/dev/drm/drm_lock.h4
-rw-r--r--sys/dev/drm/drm_memory.h4
-rw-r--r--sys/dev/drm/drm_memory_debug.h4
-rw-r--r--sys/dev/drm/drm_os_freebsd.h2
-rw-r--r--sys/dev/drm/drm_pci.h2
-rw-r--r--sys/dev/drm/drm_sarea.h2
-rw-r--r--sys/dev/drm/drm_scatter.h4
-rw-r--r--sys/dev/drm/drm_sysctl.h2
-rw-r--r--sys/dev/drm/drm_vm.h2
-rw-r--r--sys/dev/drm/mga.h4
-rw-r--r--sys/dev/drm/mga_dma.c4
-rw-r--r--sys/dev/drm/mga_drm.h4
-rw-r--r--sys/dev/drm/mga_drv.c4
-rw-r--r--sys/dev/drm/mga_drv.h4
-rw-r--r--sys/dev/drm/mga_irq.c4
-rw-r--r--sys/dev/drm/mga_state.c4
-rw-r--r--sys/dev/drm/mga_ucode.h4
-rw-r--r--sys/dev/drm/mga_warp.c4
-rw-r--r--sys/dev/drm/r128.h4
-rw-r--r--sys/dev/drm/r128_cce.c4
-rw-r--r--sys/dev/drm/r128_drm.h4
-rw-r--r--sys/dev/drm/r128_drv.c4
-rw-r--r--sys/dev/drm/r128_drv.h4
-rw-r--r--sys/dev/drm/r128_irq.c4
-rw-r--r--sys/dev/drm/r128_state.c4
-rw-r--r--sys/dev/drm/radeon.h4
-rw-r--r--sys/dev/drm/radeon_cp.c4
-rw-r--r--sys/dev/drm/radeon_drm.h4
-rw-r--r--sys/dev/drm/radeon_drv.c6
-rw-r--r--sys/dev/drm/radeon_drv.h4
-rw-r--r--sys/dev/drm/radeon_irq.c4
-rw-r--r--sys/dev/drm/radeon_mem.c4
-rw-r--r--sys/dev/drm/radeon_state.c4
-rw-r--r--sys/dev/drm/sis.h4
-rw-r--r--sys/dev/drm/sis_drv.c4
-rw-r--r--sys/dev/drm/sis_drv.h4
-rw-r--r--sys/dev/drm/sis_ds.c4
-rw-r--r--sys/dev/drm/sis_ds.h4
-rw-r--r--sys/dev/drm/sis_mm.c5
-rw-r--r--sys/dev/drm/tdfx.h4
-rw-r--r--sys/dev/drm/tdfx_drv.c4
-rw-r--r--sys/dev/ed/if_ed.c2
-rw-r--r--sys/dev/ed/if_ed98.h2
-rw-r--r--sys/dev/ed/if_ed_cbus.c2
-rw-r--r--sys/dev/ed/if_ed_isa.c2
-rw-r--r--sys/dev/ed/if_ed_pccard.c2
-rw-r--r--sys/dev/ed/if_edreg.h2
-rw-r--r--sys/dev/ed/if_edvar.h2
-rw-r--r--sys/dev/eisa/eisa_if.m2
-rw-r--r--sys/dev/eisa/eisaconf.c2
-rw-r--r--sys/dev/eisa/eisaconf.h2
-rw-r--r--sys/dev/em/LICENSE2
-rw-r--r--sys/dev/en/if_en_pci.c3
-rw-r--r--sys/dev/en/midway.c3
-rw-r--r--sys/dev/en/midwayvar.h3
-rw-r--r--sys/dev/ep/if_ep.c2
-rw-r--r--sys/dev/ep/if_ep_eisa.c2
-rw-r--r--sys/dev/ep/if_ep_isa.c2
-rw-r--r--sys/dev/ep/if_ep_pccard.c2
-rw-r--r--sys/dev/ep/if_epreg.h2
-rw-r--r--sys/dev/esp/ncr53c9x.c2
-rw-r--r--sys/dev/esp/ncr53c9xreg.h2
-rw-r--r--sys/dev/esp/ncr53c9xvar.h2
-rw-r--r--sys/dev/ex/if_ex.c2
-rw-r--r--sys/dev/ex/if_exreg.h2
-rw-r--r--sys/dev/exca/excareg.h2
-rw-r--r--sys/dev/exca/excavar.h2
-rw-r--r--sys/dev/fatm/firmware.h2
-rw-r--r--sys/dev/fatm/if_fatm.c2
-rw-r--r--sys/dev/fatm/if_fatm_rate.h2
-rw-r--r--sys/dev/fatm/if_fatmreg.h2
-rw-r--r--sys/dev/fatm/if_fatmvar.h2
-rw-r--r--sys/dev/fb/gallant12x22.h2
-rw-r--r--sys/dev/fb/gfb.h2
-rw-r--r--sys/dev/fb/tga.h2
-rw-r--r--sys/dev/fdc/fdc_isa.c14
-rw-r--r--sys/dev/fdc/fdc_pccard.c14
-rw-r--r--sys/dev/fdc/fdcvar.h14
-rw-r--r--sys/dev/fe/if_fe.c2
-rw-r--r--sys/dev/fe/if_fe_cbus.c2
-rw-r--r--sys/dev/fe/if_fe_isa.c2
-rw-r--r--sys/dev/fe/if_fe_pccard.c2
-rw-r--r--sys/dev/fe/if_fereg.h2
-rw-r--r--sys/dev/fe/if_fevar.h2
-rw-r--r--sys/dev/firewire/firewire.c2
-rw-r--r--sys/dev/firewire/firewire.h2
-rw-r--r--sys/dev/firewire/firewire_phy.h2
-rw-r--r--sys/dev/firewire/firewirereg.h2
-rw-r--r--sys/dev/firewire/fwdev.c2
-rw-r--r--sys/dev/firewire/fwdma.c2
-rw-r--r--sys/dev/firewire/fwdma.h2
-rw-r--r--sys/dev/firewire/fwmem.c2
-rw-r--r--sys/dev/firewire/fwmem.h2
-rw-r--r--sys/dev/firewire/fwohci.c2
-rw-r--r--sys/dev/firewire/fwohci_pci.c2
-rw-r--r--sys/dev/firewire/fwohcireg.h2
-rw-r--r--sys/dev/firewire/fwohcivar.h2
-rw-r--r--sys/dev/firewire/fwphyreg.h2
-rw-r--r--sys/dev/firewire/iec13213.h6
-rw-r--r--sys/dev/firewire/iec68113.h2
-rw-r--r--sys/dev/firewire/if_fwe.c2
-rw-r--r--sys/dev/firewire/if_fwevar.h2
-rw-r--r--sys/dev/firewire/if_fwip.c2
-rw-r--r--sys/dev/firewire/if_fwipvar.h2
-rw-r--r--sys/dev/firewire/sbp.c2
-rw-r--r--sys/dev/firewire/sbp.h2
-rw-r--r--sys/dev/firewire/sbp_targ.c2
-rw-r--r--sys/dev/fxp/if_fxpreg.h2
-rw-r--r--sys/dev/fxp/if_fxpvar.h2
-rw-r--r--sys/dev/fxp/rcvbundl.h2
-rw-r--r--sys/dev/gem/if_gem_pci.c2
-rw-r--r--sys/dev/gem/if_gemreg.h2
-rw-r--r--sys/dev/gem/if_gemvar.h2
-rw-r--r--sys/dev/gfb/gfb_pci.c2
-rw-r--r--sys/dev/gfb/gfb_pci.h2
-rw-r--r--sys/dev/harp/if_harp.c2
-rw-r--r--sys/dev/hatm/if_hatm.c2
-rw-r--r--sys/dev/hatm/if_hatm_intr.c2
-rw-r--r--sys/dev/hatm/if_hatm_ioctl.c2
-rw-r--r--sys/dev/hatm/if_hatm_rx.c2
-rw-r--r--sys/dev/hatm/if_hatm_tx.c2
-rw-r--r--sys/dev/hatm/if_hatmconf.h2
-rw-r--r--sys/dev/hatm/if_hatmreg.h2
-rw-r--r--sys/dev/hatm/if_hatmvar.h2
-rw-r--r--sys/dev/hfa/fore.h2
-rw-r--r--sys/dev/hfa/fore_aali.h2
-rw-r--r--sys/dev/hfa/fore_command.c2
-rw-r--r--sys/dev/hfa/fore_if.c2
-rw-r--r--sys/dev/hfa/fore_include.h2
-rw-r--r--sys/dev/hfa/fore_init.c2
-rw-r--r--sys/dev/hfa/fore_intr.c2
-rw-r--r--sys/dev/hfa/fore_output.c2
-rw-r--r--sys/dev/hfa/fore_slave.h2
-rw-r--r--sys/dev/hfa/fore_stats.c2
-rw-r--r--sys/dev/hfa/fore_stats.h2
-rw-r--r--sys/dev/hfa/fore_var.h2
-rw-r--r--sys/dev/hfa/fore_vcm.c2
-rw-r--r--sys/dev/hifn/hifn7751.c2
-rw-r--r--sys/dev/hifn/hifn7751reg.h2
-rw-r--r--sys/dev/hifn/hifn7751var.h2
-rw-r--r--sys/dev/hptmv/entry.c2
-rw-r--r--sys/dev/hptmv/global.h2
-rw-r--r--sys/dev/hptmv/hptintf.h2
-rw-r--r--sys/dev/hptmv/mv.c2
-rw-r--r--sys/dev/hptmv/mvOs.h2
-rw-r--r--sys/dev/hptmv/osbsd.h2
-rw-r--r--sys/dev/ic/cd180.h2
-rw-r--r--sys/dev/ic/hd64570.h2
-rw-r--r--sys/dev/ic/wd33c93reg.h2
-rw-r--r--sys/dev/ichsmb/ichsmb.c3
-rw-r--r--sys/dev/ichsmb/ichsmb_reg.h3
-rw-r--r--sys/dev/ichsmb/ichsmb_var.h3
-rw-r--r--sys/dev/ichwd/ichwd.c2
-rw-r--r--sys/dev/ichwd/ichwd.h2
-rw-r--r--sys/dev/ida/ida_eisa.c2
-rw-r--r--sys/dev/idt/idt.c2
-rw-r--r--sys/dev/idt/idt_harp.c2
-rw-r--r--sys/dev/idt/idt_pci.c2
-rw-r--r--sys/dev/idt/idtreg.h2
-rw-r--r--sys/dev/idt/idtvar.h2
-rw-r--r--sys/dev/ie/if_iee16.h2
-rw-r--r--sys/dev/if_ndis/if_ndis.c2
-rw-r--r--sys/dev/if_ndis/if_ndis_pccard.c2
-rw-r--r--sys/dev/if_ndis/if_ndis_pci.c2
-rw-r--r--sys/dev/if_ndis/if_ndisvar.h2
-rw-r--r--sys/dev/iicbus/iicbb_if.m2
-rw-r--r--sys/dev/iicbus/iicbus_if.m2
-rw-r--r--sys/dev/iir/iir.c2
-rw-r--r--sys/dev/iir/iir.h2
-rw-r--r--sys/dev/iir/iir_ctrl.c2
-rw-r--r--sys/dev/isp/isp.c2
-rw-r--r--sys/dev/isp/isp_freebsd.c2
-rw-r--r--sys/dev/isp/isp_freebsd.h2
-rw-r--r--sys/dev/isp/isp_inline.h2
-rw-r--r--sys/dev/isp/isp_ioctl.h2
-rw-r--r--sys/dev/isp/isp_target.c2
-rw-r--r--sys/dev/isp/isp_target.h2
-rw-r--r--sys/dev/isp/isp_tpublic.h2
-rw-r--r--sys/dev/isp/ispmbox.h2
-rw-r--r--sys/dev/isp/ispreg.h2
-rw-r--r--sys/dev/isp/ispvar.h2
-rw-r--r--sys/dev/ispfw/asm_1000.h2
-rw-r--r--sys/dev/ispfw/asm_1040.h2
-rw-r--r--sys/dev/ispfw/asm_1080.h2
-rw-r--r--sys/dev/ispfw/asm_12160.h2
-rw-r--r--sys/dev/ispfw/asm_2100.h2
-rw-r--r--sys/dev/ispfw/asm_2200.h2
-rw-r--r--sys/dev/ispfw/asm_2300.h4
-rw-r--r--sys/dev/ixgb/LICENSE4
-rw-r--r--sys/dev/lge/if_lge.c2
-rw-r--r--sys/dev/lge/if_lgereg.h2
-rw-r--r--sys/dev/lnc/if_lnc_cbus.c2
-rw-r--r--sys/dev/lnc/if_lnc_isa.c2
-rw-r--r--sys/dev/mcd/mcd.c2
-rw-r--r--sys/dev/mcd/mcdreg.h2
-rw-r--r--sys/dev/md/md.c4
-rw-r--r--sys/dev/mii/acphy.c2
-rw-r--r--sys/dev/mii/amphy.c2
-rw-r--r--sys/dev/mii/amphyreg.h2
-rw-r--r--sys/dev/mii/bmtphy.c2
-rw-r--r--sys/dev/mii/bmtphyreg.h1
-rw-r--r--sys/dev/mii/brgphy.c2
-rw-r--r--sys/dev/mii/brgphyreg.h2
-rw-r--r--sys/dev/mii/ciphy.c2
-rw-r--r--sys/dev/mii/ciphyreg.h2
-rw-r--r--sys/dev/mii/dcphy.c2
-rw-r--r--sys/dev/mii/e1000phy.c2
-rw-r--r--sys/dev/mii/e1000phyreg.h4
-rw-r--r--sys/dev/mii/exphy.c2
-rw-r--r--sys/dev/mii/lxtphy.c2
-rw-r--r--sys/dev/mii/mii.h2
-rw-r--r--sys/dev/mii/mlphy.c2
-rw-r--r--sys/dev/mii/nsgphy.c2
-rw-r--r--sys/dev/mii/nsgphyreg.h2
-rw-r--r--sys/dev/mii/nsphy.c2
-rw-r--r--sys/dev/mii/pnaphy.c2
-rw-r--r--sys/dev/mii/qsphy.c2
-rw-r--r--sys/dev/mii/rgephy.c2
-rw-r--r--sys/dev/mii/rgephyreg.h2
-rw-r--r--sys/dev/mii/rlphy.c2
-rw-r--r--sys/dev/mii/tdkphy.c2
-rw-r--r--sys/dev/mii/tdkphyreg.h2
-rw-r--r--sys/dev/mii/tlphy.c2
-rw-r--r--sys/dev/mii/tlphyreg.h2
-rw-r--r--sys/dev/mii/ukphy.c2
-rw-r--r--sys/dev/mii/xmphy.c2
-rw-r--r--sys/dev/mii/xmphyreg.h2
-rw-r--r--sys/dev/mpt/mpilib/fc_log.h2
-rw-r--r--sys/dev/mpt/mpilib/mpi.h2
-rw-r--r--sys/dev/mpt/mpilib/mpi_cnfg.h2
-rw-r--r--sys/dev/mpt/mpilib/mpi_fc.h2
-rw-r--r--sys/dev/mpt/mpilib/mpi_init.h2
-rw-r--r--sys/dev/mpt/mpilib/mpi_ioc.h2
-rw-r--r--sys/dev/mpt/mpilib/mpi_lan.h2
-rw-r--r--sys/dev/mpt/mpilib/mpi_raid.h2
-rw-r--r--sys/dev/mpt/mpilib/mpi_targ.h2
-rw-r--r--sys/dev/mpt/mpilib/mpi_type.h2
-rw-r--r--sys/dev/mpt/mpt.h2
-rw-r--r--sys/dev/mpt/mpt_freebsd.h2
-rw-r--r--sys/dev/my/if_myreg.h2
-rw-r--r--sys/dev/ncv/ncr53c500.c2
-rw-r--r--sys/dev/ncv/ncr53c500_pccard.c2
-rw-r--r--sys/dev/ncv/ncr53c500hw.h2
-rw-r--r--sys/dev/ncv/ncr53c500hwtab.h2
-rw-r--r--sys/dev/ncv/ncr53c500reg.h2
-rw-r--r--sys/dev/ncv/ncr53c500var.h2
-rw-r--r--sys/dev/nge/if_nge.c2
-rw-r--r--sys/dev/nge/if_ngereg.h2
-rw-r--r--sys/dev/nmdm/nmdm.c2
-rw-r--r--sys/dev/nsp/nsp.c2
-rw-r--r--sys/dev/nsp/nsp_pccard.c2
-rw-r--r--sys/dev/nsp/nspreg.h2
-rw-r--r--sys/dev/nsp/nspvar.h2
-rw-r--r--sys/dev/ofw/ofw_bus_if.m1
-rw-r--r--sys/dev/ofw/ofw_console.c2
-rw-r--r--sys/dev/ofw/ofw_disk.c2
-rw-r--r--sys/dev/ofw/openfirm.c4
-rw-r--r--sys/dev/ofw/openfirm.h2
-rw-r--r--sys/dev/ofw/openfirmio.c2
-rw-r--r--sys/dev/ofw/openfirmio.h2
-rw-r--r--sys/dev/owi/if_owi.c2
-rw-r--r--sys/dev/owi/if_owi_pccard.c2
-rw-r--r--sys/dev/owi/if_wireg.h2
-rw-r--r--sys/dev/owi/if_wivar.h2
-rw-r--r--sys/dev/patm/genrtab/genrtab.c2
-rw-r--r--sys/dev/patm/idt77252reg.h2
-rw-r--r--sys/dev/patm/if_patm.c2
-rw-r--r--sys/dev/patm/if_patm_attach.c2
-rw-r--r--sys/dev/patm/if_patm_intr.c2
-rw-r--r--sys/dev/patm/if_patm_ioctl.c2
-rw-r--r--sys/dev/patm/if_patm_rx.c2
-rw-r--r--sys/dev/patm/if_patm_tx.c2
-rw-r--r--sys/dev/patm/if_patmvar.h2
-rw-r--r--sys/dev/pccard/card_if.m2
-rw-r--r--sys/dev/pccard/pccard.c2
-rw-r--r--sys/dev/pccard/pccard_cis.c2
-rw-r--r--sys/dev/pccard/pccard_cis.h2
-rw-r--r--sys/dev/pccard/pccard_cis_quirks.c2
-rw-r--r--sys/dev/pccard/pccarddevs2
-rw-r--r--sys/dev/pccard/pccardreg.h2
-rw-r--r--sys/dev/pccard/pccardvar.h2
-rw-r--r--sys/dev/pccard/power_if.m2
-rw-r--r--sys/dev/pccbb/pccbb.c17
-rw-r--r--sys/dev/pccbb/pccbb_isa.c14
-rw-r--r--sys/dev/pccbb/pccbb_pci.c17
-rw-r--r--sys/dev/pccbb/pccbbdevid.h27
-rw-r--r--sys/dev/pccbb/pccbbreg.h14
-rw-r--r--sys/dev/pccbb/pccbbvar.h14
-rw-r--r--sys/dev/pci/pci_if.m2
-rw-r--r--sys/dev/pci/pci_private.h2
-rw-r--r--sys/dev/pci/pcib_if.m2
-rw-r--r--sys/dev/pci/pcireg.h2
-rw-r--r--sys/dev/pci/pcivar.h2
-rw-r--r--sys/dev/pdq/pdq.c2
-rw-r--r--sys/dev/ppbus/lpt.c2
-rw-r--r--sys/dev/ppbus/lptio.h2
-rw-r--r--sys/dev/ppbus/pcfclock.c2
-rw-r--r--sys/dev/ppbus/ppbus_if.m2
-rw-r--r--sys/dev/ppbus/pps.c2
-rw-r--r--sys/dev/ppc/ppcvar.h1
-rw-r--r--sys/dev/puc/puc.c26
-rw-r--r--sys/dev/puc/puc_ebus.c2
-rw-r--r--sys/dev/puc/puc_pci.c2
-rw-r--r--sys/dev/puc/puc_sbus.c2
-rw-r--r--sys/dev/puc/pucdata.c2
-rw-r--r--sys/dev/puc/pucvar.h26
-rw-r--r--sys/dev/ray/if_ray.c2
-rw-r--r--sys/dev/ray/if_raydbg.h2
-rw-r--r--sys/dev/ray/if_raymib.h2
-rw-r--r--sys/dev/ray/if_rayreg.h2
-rw-r--r--sys/dev/ray/if_rayvar.h2
-rw-r--r--sys/dev/rc/rc.c2
-rw-r--r--sys/dev/rc/rcreg.h2
-rw-r--r--sys/dev/re/if_re.c2
-rw-r--r--sys/dev/rndtest/rndtest.c2
-rw-r--r--sys/dev/rndtest/rndtest.h2
-rw-r--r--sys/dev/rp/rp.c2
-rw-r--r--sys/dev/rp/rp_isa.c2
-rw-r--r--sys/dev/rp/rpreg.h2
-rw-r--r--sys/dev/rp/rpvar.h2
-rw-r--r--sys/dev/sab/sab.c2
-rw-r--r--sys/dev/sab/sab82532reg.h2
-rw-r--r--sys/dev/sbni/if_sbni.c2
-rw-r--r--sys/dev/sbni/if_sbni_isa.c2
-rw-r--r--sys/dev/sbni/if_sbnireg.h2
-rw-r--r--sys/dev/sbni/if_sbnivar.h2
-rw-r--r--sys/dev/sbsh/if_sbshreg.h2
-rw-r--r--sys/dev/si/si.c2
-rw-r--r--sys/dev/si/si.h2
-rw-r--r--sys/dev/si/si2_z280.c2
-rw-r--r--sys/dev/si/si3_t225.c2
-rw-r--r--sys/dev/si/si_eisa.c2
-rw-r--r--sys/dev/si/si_isa.c2
-rw-r--r--sys/dev/si/sireg.h2
-rw-r--r--sys/dev/si/sivar.h2
-rw-r--r--sys/dev/sio/sio_isa.c2
-rw-r--r--sys/dev/sio/sio_pccard.c2
-rw-r--r--sys/dev/smbus/smbus_if.m2
-rw-r--r--sys/dev/sn/if_sn.c2
-rw-r--r--sys/dev/sn/if_sn_isa.c2
-rw-r--r--sys/dev/sn/if_snreg.h2
-rw-r--r--sys/dev/sn/if_snvar.h2
-rw-r--r--sys/dev/snc/dp83932.c4
-rw-r--r--sys/dev/snc/dp83932reg.h2
-rw-r--r--sys/dev/snc/dp83932subr.c2
-rw-r--r--sys/dev/snc/dp83932subr.h4
-rw-r--r--sys/dev/snc/dp83932var.h5
-rw-r--r--sys/dev/snc/if_snc.c2
-rw-r--r--sys/dev/snc/if_snc_cbus.c2
-rw-r--r--sys/dev/snc/if_snc_pccard.c2
-rw-r--r--sys/dev/snc/if_sncreg.h2
-rw-r--r--sys/dev/snc/if_sncvar.h2
-rw-r--r--sys/dev/snp/snp.c2
-rw-r--r--sys/dev/sound/driver.c2
-rw-r--r--sys/dev/sound/isa/ad1816.c2
-rw-r--r--sys/dev/sound/isa/ad1816.h2
-rw-r--r--sys/dev/sound/isa/es1888.c2
-rw-r--r--sys/dev/sound/isa/ess.c2
-rw-r--r--sys/dev/sound/isa/gusc.c2
-rw-r--r--sys/dev/sound/isa/mss.c2
-rw-r--r--sys/dev/sound/isa/mss.h30
-rw-r--r--sys/dev/sound/isa/sb16.c2
-rw-r--r--sys/dev/sound/isa/sb8.c2
-rw-r--r--sys/dev/sound/isa/sbc.c2
-rw-r--r--sys/dev/sound/isa/sndbuf_dma.c2
-rw-r--r--sys/dev/sound/pci/als4000.c2
-rw-r--r--sys/dev/sound/pci/als4000.h2
-rw-r--r--sys/dev/sound/pci/aureal.c2
-rw-r--r--sys/dev/sound/pci/aureal.h2
-rw-r--r--sys/dev/sound/pci/cmi.c2
-rw-r--r--sys/dev/sound/pci/cmireg.h2
-rw-r--r--sys/dev/sound/pci/cs4281.c2
-rw-r--r--sys/dev/sound/pci/cs4281.h2
-rw-r--r--sys/dev/sound/pci/csa.c2
-rw-r--r--sys/dev/sound/pci/csapcm.c2
-rw-r--r--sys/dev/sound/pci/ds1-fw.h3
-rw-r--r--sys/dev/sound/pci/ds1.c2
-rw-r--r--sys/dev/sound/pci/emu10k1.c2
-rw-r--r--sys/dev/sound/pci/es137x.c2
-rw-r--r--sys/dev/sound/pci/es137x.h2
-rw-r--r--sys/dev/sound/pci/fm801.c2
-rw-r--r--sys/dev/sound/pci/ich.c2
-rw-r--r--sys/dev/sound/pci/ich.h2
-rw-r--r--sys/dev/sound/pci/maestro.c2
-rw-r--r--sys/dev/sound/pci/neomagic-coeff.h2
-rw-r--r--sys/dev/sound/pci/neomagic.c2
-rw-r--r--sys/dev/sound/pci/neomagic.h2
-rw-r--r--sys/dev/sound/pci/solo.c2
-rw-r--r--sys/dev/sound/pci/t4dwave.c2
-rw-r--r--sys/dev/sound/pci/t4dwave.h2
-rw-r--r--sys/dev/sound/pci/via8233.c2
-rw-r--r--sys/dev/sound/pci/via8233.h2
-rw-r--r--sys/dev/sound/pci/via82c686.c2
-rw-r--r--sys/dev/sound/pci/vibes.c2
-rw-r--r--sys/dev/sound/pci/vibes.h2
-rw-r--r--sys/dev/sound/pcm/ac97.c2
-rw-r--r--sys/dev/sound/pcm/ac97.h2
-rw-r--r--sys/dev/sound/pcm/ac97_if.m1
-rw-r--r--sys/dev/sound/pcm/ac97_patch.c2
-rw-r--r--sys/dev/sound/pcm/ac97_patch.h2
-rw-r--r--sys/dev/sound/pcm/buffer.c2
-rw-r--r--sys/dev/sound/pcm/buffer.h2
-rw-r--r--sys/dev/sound/pcm/channel.c2
-rw-r--r--sys/dev/sound/pcm/channel.h2
-rw-r--r--sys/dev/sound/pcm/channel_if.m1
-rw-r--r--sys/dev/sound/pcm/dsp.c2
-rw-r--r--sys/dev/sound/pcm/dsp.h2
-rw-r--r--sys/dev/sound/pcm/fake.c2
-rw-r--r--sys/dev/sound/pcm/feeder.c2
-rw-r--r--sys/dev/sound/pcm/feeder.h2
-rw-r--r--sys/dev/sound/pcm/feeder_fmt.c2
-rw-r--r--sys/dev/sound/pcm/feeder_if.m1
-rw-r--r--sys/dev/sound/pcm/feeder_rate.c2
-rw-r--r--sys/dev/sound/pcm/mixer.c2
-rw-r--r--sys/dev/sound/pcm/mixer.h2
-rw-r--r--sys/dev/sound/pcm/mixer_if.m1
-rw-r--r--sys/dev/sound/pcm/sndstat.c2
-rw-r--r--sys/dev/sound/pcm/sound.c2
-rw-r--r--sys/dev/sound/pcm/sound.h2
-rw-r--r--sys/dev/sound/pcm/vchan.c2
-rw-r--r--sys/dev/sound/pcm/vchan.h2
-rw-r--r--sys/dev/sound/sbus/apcdmareg.h2
-rw-r--r--sys/dev/sound/sbus/cs4231.c2
-rw-r--r--sys/dev/sound/usb/uaudio.c2
-rw-r--r--sys/dev/sound/usb/uaudio.h2
-rw-r--r--sys/dev/sound/usb/uaudio_pcm.c2
-rw-r--r--sys/dev/sound/usb/uaudioreg.h4
-rw-r--r--sys/dev/sr/if_sr.c2
-rw-r--r--sys/dev/sr/if_sr.h2
-rw-r--r--sys/dev/sr/if_sr_isa.c2
-rw-r--r--sys/dev/sr/if_sr_pci.c2
-rw-r--r--sys/dev/sr/if_srregs.h2
-rw-r--r--sys/dev/stg/tmc18c30.c2
-rw-r--r--sys/dev/stg/tmc18c30_isa.c2
-rw-r--r--sys/dev/stg/tmc18c30_pccard.c2
-rw-r--r--sys/dev/stg/tmc18c30_subr.c2
-rw-r--r--sys/dev/stg/tmc18c30reg.h2
-rw-r--r--sys/dev/stg/tmc18c30var.h2
-rw-r--r--sys/dev/streams/streams.c2
-rw-r--r--sys/dev/sx/cd1865.h2
-rw-r--r--sys/dev/sx/sx.c2
-rw-r--r--sys/dev/sx/sx.h2
-rw-r--r--sys/dev/sx/sx_pci.c2
-rw-r--r--sys/dev/sx/sx_util.c2
-rw-r--r--sys/dev/sx/sx_util.h2
-rw-r--r--sys/dev/sx/sxvar.h2
-rw-r--r--sys/dev/sym/README.sym2
-rw-r--r--sys/dev/sym/sym_conf.h2
-rw-r--r--sys/dev/sym/sym_defs.h2
-rw-r--r--sys/dev/sym/sym_fw.h2
-rw-r--r--sys/dev/sym/sym_fw1.h2
-rw-r--r--sys/dev/sym/sym_fw2.h2
-rw-r--r--sys/dev/tdfx/tdfx_io.h2
-rw-r--r--sys/dev/tdfx/tdfx_linux.h2
-rw-r--r--sys/dev/tdfx/tdfx_pci.h2
-rw-r--r--sys/dev/tdfx/tdfx_vars.h2
-rw-r--r--sys/dev/tga/tga_pci.c2
-rw-r--r--sys/dev/tga/tga_pci.h2
-rw-r--r--sys/dev/trm/trm.c5
-rw-r--r--sys/dev/trm/trm.h4
-rw-r--r--sys/dev/txp/3c990img.h2
-rw-r--r--sys/dev/txp/if_txp.c2
-rw-r--r--sys/dev/txp/if_txpreg.h2
-rw-r--r--sys/dev/uart/uart.h2
-rw-r--r--sys/dev/uart/uart_bus.h3
-rw-r--r--sys/dev/uart/uart_bus_acpi.c2
-rw-r--r--sys/dev/uart/uart_bus_isa.c2
-rw-r--r--sys/dev/uart/uart_bus_pccard.c2
-rw-r--r--sys/dev/uart/uart_bus_pci.c2
-rw-r--r--sys/dev/uart/uart_core.c2
-rw-r--r--sys/dev/uart/uart_cpu.h2
-rw-r--r--sys/dev/uart/uart_cpu_alpha.c2
-rw-r--r--sys/dev/uart/uart_cpu_amd64.c2
-rw-r--r--sys/dev/uart/uart_cpu_i386.c2
-rw-r--r--sys/dev/uart/uart_cpu_ia64.c2
-rw-r--r--sys/dev/uart/uart_cpu_pc98.c2
-rw-r--r--sys/dev/uart/uart_cpu_sparc64.c2
-rw-r--r--sys/dev/uart/uart_dbg.c2
-rw-r--r--sys/dev/uart/uart_dev_ns8250.c2
-rw-r--r--sys/dev/uart/uart_dev_sab82532.c2
-rw-r--r--sys/dev/uart/uart_dev_z8530.c2
-rw-r--r--sys/dev/uart/uart_if.m1
-rw-r--r--sys/dev/uart/uart_kbd_sun.h2
-rw-r--r--sys/dev/uart/uart_subr.c2
-rw-r--r--sys/dev/uart/uart_tty.c2
-rw-r--r--sys/dev/ubsec/ubsec.c2
-rw-r--r--sys/dev/ubsec/ubsecreg.h2
-rw-r--r--sys/dev/ubsec/ubsecvar.h2
-rw-r--r--sys/dev/usb/dsbr100io.h2
-rw-r--r--sys/dev/usb/ehci.c2
-rw-r--r--sys/dev/usb/ehcireg.h2
-rw-r--r--sys/dev/usb/ehcivar.h2
-rw-r--r--sys/dev/usb/hid.c2
-rw-r--r--sys/dev/usb/hid.h2
-rw-r--r--sys/dev/usb/if_auereg.h2
-rw-r--r--sys/dev/usb/if_axe.c2
-rw-r--r--sys/dev/usb/if_axereg.h2
-rw-r--r--sys/dev/usb/if_cue.c2
-rw-r--r--sys/dev/usb/if_cuereg.h2
-rw-r--r--sys/dev/usb/if_kue.c2
-rw-r--r--sys/dev/usb/if_kuereg.h2
-rw-r--r--sys/dev/usb/if_udav.c2
-rw-r--r--sys/dev/usb/if_udavreg.h2
-rw-r--r--sys/dev/usb/kue_fw.h2
-rw-r--r--sys/dev/usb/ohci.c2
-rw-r--r--sys/dev/usb/ohcireg.h2
-rw-r--r--sys/dev/usb/ohcivar.h2
-rw-r--r--sys/dev/usb/rio500_usb.h3
-rw-r--r--sys/dev/usb/ubsa.c2
-rw-r--r--sys/dev/usb/ubser.c4
-rw-r--r--sys/dev/usb/ubser.h2
-rw-r--r--sys/dev/usb/ucom.c2
-rw-r--r--sys/dev/usb/ucomvar.h2
-rw-r--r--sys/dev/usb/udbp.c2
-rw-r--r--sys/dev/usb/udbp.h2
-rw-r--r--sys/dev/usb/ufm.c2
-rw-r--r--sys/dev/usb/uftdi.c2
-rw-r--r--sys/dev/usb/ugen.c2
-rw-r--r--sys/dev/usb/ugraphire_rdesc.h2
-rw-r--r--sys/dev/usb/uhci.c2
-rw-r--r--sys/dev/usb/uhci_pci.c2
-rw-r--r--sys/dev/usb/uhcireg.h2
-rw-r--r--sys/dev/usb/uhcivar.h2
-rw-r--r--sys/dev/usb/uhid.c2
-rw-r--r--sys/dev/usb/uhub.c2
-rw-r--r--sys/dev/usb/ukbd.c3
-rw-r--r--sys/dev/usb/ulpt.c2
-rw-r--r--sys/dev/usb/umodem.c2
-rw-r--r--sys/dev/usb/ums.c3
-rw-r--r--sys/dev/usb/uplcom.c4
-rw-r--r--sys/dev/usb/urio.c4
-rw-r--r--sys/dev/usb/usb.c2
-rw-r--r--sys/dev/usb/usb.h2
-rw-r--r--sys/dev/usb/usb_ethersubr.c2
-rw-r--r--sys/dev/usb/usb_ethersubr.h2
-rw-r--r--sys/dev/usb/usb_if.m2
-rw-r--r--sys/dev/usb/usb_mem.c2
-rw-r--r--sys/dev/usb/usb_mem.h2
-rw-r--r--sys/dev/usb/usb_port.h2
-rw-r--r--sys/dev/usb/usb_quirks.c2
-rw-r--r--sys/dev/usb/usb_quirks.h2
-rw-r--r--sys/dev/usb/usb_subr.c2
-rw-r--r--sys/dev/usb/usbcdc.h2
-rw-r--r--sys/dev/usb/usbdevs5
-rw-r--r--sys/dev/usb/usbdi.c2
-rw-r--r--sys/dev/usb/usbdi.h2
-rw-r--r--sys/dev/usb/usbdi_util.c2
-rw-r--r--sys/dev/usb/usbdi_util.h2
-rw-r--r--sys/dev/usb/usbdivar.h2
-rw-r--r--sys/dev/usb/usbhid.h2
-rw-r--r--sys/dev/usb/uscanner.c2
-rw-r--r--sys/dev/usb/uvisor.c2
-rw-r--r--sys/dev/utopia/idtphy.h2
-rw-r--r--sys/dev/utopia/suni.h2
-rw-r--r--sys/dev/utopia/utopia.c2
-rw-r--r--sys/dev/utopia/utopia.h2
-rw-r--r--sys/dev/vge/if_vge.c2
-rw-r--r--sys/dev/vge/if_vgereg.h2
-rw-r--r--sys/dev/vge/if_vgevar.h2
-rw-r--r--sys/dev/vx/if_vx.c2
-rw-r--r--sys/dev/vx/if_vx_eisa.c2
-rw-r--r--sys/dev/vx/if_vx_pci.c2
-rw-r--r--sys/dev/vx/if_vxreg.h2
-rw-r--r--sys/dev/vx/if_vxvar.h2
-rw-r--r--sys/dev/wds/wd7000.c2
-rw-r--r--sys/dev/wi/if_wavelan_ieee.h2
-rw-r--r--sys/dev/wi/if_wi.c2
-rw-r--r--sys/dev/wi/if_wi_pccard.c2
-rw-r--r--sys/dev/wi/if_wi_pci.c2
-rw-r--r--sys/dev/wi/if_wireg.h2
-rw-r--r--sys/dev/wi/if_wivar.h2
-rw-r--r--sys/dev/wi/spectrum24t_cf.h2
-rw-r--r--sys/dev/wl/if_wl.c2
-rw-r--r--sys/dev/wl/if_wl.h2
-rw-r--r--sys/dev/xe/if_xe.c2
-rw-r--r--sys/dev/xe/if_xe_pccard.c2
-rw-r--r--sys/dev/zs/z8530reg.h2
1059 files changed, 1326 insertions, 1308 deletions
diff --git a/sys/alpha/alpha/busdma_machdep.c b/sys/alpha/alpha/busdma_machdep.c
index 0dc361cf422f..dad249f9a085 100644
--- a/sys/alpha/alpha/busdma_machdep.c
+++ b/sys/alpha/alpha/busdma_machdep.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997 Justin T. Gibbs.
* All rights reserved.
*
diff --git a/sys/alpha/alpha/clock.c b/sys/alpha/alpha/clock.c
index 8ac515effe5f..af2018d77a78 100644
--- a/sys/alpha/alpha/clock.c
+++ b/sys/alpha/alpha/clock.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1988 University of Utah.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/alpha/alpha/clock_if.m b/sys/alpha/alpha/clock_if.m
index 9665135b22de..d0584b6ce69f 100644
--- a/sys/alpha/alpha/clock_if.m
+++ b/sys/alpha/alpha/clock_if.m
@@ -1,4 +1,4 @@
-#
+#-
# Copyright (c) 1998 Doug Rabson
# All rights reserved.
#
diff --git a/sys/alpha/alpha/cpuconf.c b/sys/alpha/alpha/cpuconf.c
index d79fa6e448a3..47d2be889fd7 100644
--- a/sys/alpha/alpha/cpuconf.c
+++ b/sys/alpha/alpha/cpuconf.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/alpha/alpha/db_disasm.c b/sys/alpha/alpha/db_disasm.c
index 8d98121a8d2f..dd91ddb9e108 100644
--- a/sys/alpha/alpha/db_disasm.c
+++ b/sys/alpha/alpha/db_disasm.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Mach Operating System
* Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
* All Rights Reserved.
diff --git a/sys/alpha/alpha/db_instruction.h b/sys/alpha/alpha/db_instruction.h
index d66ebe5c9a29..65e38bac9a90 100644
--- a/sys/alpha/alpha/db_instruction.h
+++ b/sys/alpha/alpha/db_instruction.h
@@ -1,6 +1,6 @@
/* $NetBSD: db_instruction.h,v 1.4 1997/09/16 22:53:32 thorpej Exp $ */
-/*
+/*-
* Mach Operating System
* Copyright (c) 1993,1992 Carnegie Mellon University
* All Rights Reserved.
diff --git a/sys/alpha/alpha/db_interface.c b/sys/alpha/alpha/db_interface.c
index 7a7553f2ec5f..12e6877a97d8 100644
--- a/sys/alpha/alpha/db_interface.c
+++ b/sys/alpha/alpha/db_interface.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Mach Operating System
* Copyright (c) 1992,1991,1990 Carnegie Mellon University
* All Rights Reserved.
diff --git a/sys/alpha/alpha/dec_1000a.c b/sys/alpha/alpha/dec_1000a.c
index 16ba0e51905c..0521af24696c 100644
--- a/sys/alpha/alpha/dec_1000a.c
+++ b/sys/alpha/alpha/dec_1000a.c
@@ -1,5 +1,5 @@
/* $NetBSD: dec_1000a.c,v 1.5 1999/04/15 22:06:47 thorpej Exp $ */
-/*
+/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
@@ -37,7 +37,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-/*
+/*-
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
* All rights reserved.
*
@@ -63,10 +63,10 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*/
-/*
+/*-
* Additional Copyright (c) 1997 by Matthew Jacob for NASA/Ames Research Center
*/
-/*
+/*-
* Additional Copyright (c) 1999 by Andrew Gallatin
*
*/
diff --git a/sys/alpha/alpha/dec_2100_a50.c b/sys/alpha/alpha/dec_2100_a50.c
index ba9e4340399e..51486d2c99f2 100644
--- a/sys/alpha/alpha/dec_2100_a50.c
+++ b/sys/alpha/alpha/dec_2100_a50.c
@@ -1,5 +1,5 @@
/* $NetBSD: dec_2100_a50.c,v 1.39 1998/04/17 02:45:19 mjacob Exp $ */
-/*
+/*-
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
* All rights reserved.
*
@@ -25,10 +25,10 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*/
-/*
+/*-
* Additional Copyright (c) 1997 by Matthew Jacob for NASA/Ames Research Center
*/
-/*
+/*-
* Additional Copyright (c) 1998 by Andrew Gallatin for Duke University.
*/
diff --git a/sys/alpha/alpha/dec_2100_a500.c b/sys/alpha/alpha/dec_2100_a500.c
index e202b2f51be9..10d5df7aeb8a 100644
--- a/sys/alpha/alpha/dec_2100_a500.c
+++ b/sys/alpha/alpha/dec_2100_a500.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000 Andrew Gallatin
* All rights reserved.
*
diff --git a/sys/alpha/alpha/dec_3000_300.c b/sys/alpha/alpha/dec_3000_300.c
index b98fbd354740..d36711113756 100644
--- a/sys/alpha/alpha/dec_3000_300.c
+++ b/sys/alpha/alpha/dec_3000_300.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997 by Matthew Jacob
* NASA AMES Research Center.
* All rights reserved.
diff --git a/sys/alpha/alpha/dec_3000_500.c b/sys/alpha/alpha/dec_3000_500.c
index 05902c69db61..eb144a73f92c 100644
--- a/sys/alpha/alpha/dec_3000_500.c
+++ b/sys/alpha/alpha/dec_3000_500.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997 by Matthew Jacob
* NASA AMES Research Center.
* All rights reserved.
diff --git a/sys/alpha/alpha/dec_axppci_33.c b/sys/alpha/alpha/dec_axppci_33.c
index 476ec0f4af02..b19226d2a58a 100644
--- a/sys/alpha/alpha/dec_axppci_33.c
+++ b/sys/alpha/alpha/dec_axppci_33.c
@@ -1,5 +1,5 @@
/* $NetBSD: dec_axppci_33.c,v 1.38 1998/07/07 08:49:12 ross Exp $ */
-/*
+/*-
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
* All rights reserved.
*
@@ -25,7 +25,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*/
-/*
+/*-
* Additional Copyright (c) 1997 by Matthew Jacob for NASA/Ames Research Center
*/
diff --git a/sys/alpha/alpha/dec_eb164.c b/sys/alpha/alpha/dec_eb164.c
index f3ac0e8dc1ee..e17400181f1c 100644
--- a/sys/alpha/alpha/dec_eb164.c
+++ b/sys/alpha/alpha/dec_eb164.c
@@ -1,5 +1,5 @@
/* $NetBSD: dec_eb164.c,v 1.26 1998/04/17 02:45:19 mjacob Exp $ */
-/*
+/*-
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
* All rights reserved.
*
@@ -25,7 +25,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*/
-/*
+/*-
* Additional Copyright (c) 1997 by Matthew Jacob for NASA/Ames Research Center
*/
diff --git a/sys/alpha/alpha/dec_eb64plus.c b/sys/alpha/alpha/dec_eb64plus.c
index 36d6afc0fcbe..f16a39574187 100644
--- a/sys/alpha/alpha/dec_eb64plus.c
+++ b/sys/alpha/alpha/dec_eb64plus.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
* All rights reserved.
*
@@ -24,7 +24,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*/
-/*
+/*-
* Additional Copyright (c) 1997 by Matthew Jacob for NASA/Ames Research Center
*/
diff --git a/sys/alpha/alpha/dec_kn20aa.c b/sys/alpha/alpha/dec_kn20aa.c
index 38ec292ba735..714bbf91896f 100644
--- a/sys/alpha/alpha/dec_kn20aa.c
+++ b/sys/alpha/alpha/dec_kn20aa.c
@@ -1,5 +1,5 @@
/* $NetBSD: dec_kn20aa.c,v 1.38 1998/04/17 02:45:19 mjacob Exp $ */
-/*
+/*-
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
* All rights reserved.
*
@@ -25,7 +25,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*/
-/*
+/*-
* Additional Copyright (c) 1997 by Matthew Jacob for NASA/Ames Research Center
*/
diff --git a/sys/alpha/alpha/dec_kn300.c b/sys/alpha/alpha/dec_kn300.c
index b4f7f3ecadfa..70b11339f843 100644
--- a/sys/alpha/alpha/dec_kn300.c
+++ b/sys/alpha/alpha/dec_kn300.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000 by Matthew Jacob
* NASA AMES Research Center.
* All rights reserved.
diff --git a/sys/alpha/alpha/dec_kn8ae.c b/sys/alpha/alpha/dec_kn8ae.c
index aa4fc35cdfd3..fbc98407d058 100644
--- a/sys/alpha/alpha/dec_kn8ae.c
+++ b/sys/alpha/alpha/dec_kn8ae.c
@@ -1,5 +1,5 @@
/* $NetBSD: dec_kn8ae.c,v 1.15 1998/02/13 00:12:50 thorpej Exp $ */
-/*
+/*-
* Copyright (c) 1997 by Matthew Jacob
* NASA AMES Research Center.
* All rights reserved.
diff --git a/sys/alpha/alpha/dec_st550.c b/sys/alpha/alpha/dec_st550.c
index 73af90082625..f664b298937a 100644
--- a/sys/alpha/alpha/dec_st550.c
+++ b/sys/alpha/alpha/dec_st550.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
* All rights reserved.
*
@@ -24,10 +24,10 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*/
-/*
+/*-
* Additional Copyright (c) 1997 by Matthew Jacob for NASA/Ames Research Center
*/
-/*
+/*-
* Additional Copyright (c) 1998 by Andrew Gallatin for Duke University
*/
diff --git a/sys/alpha/alpha/divrem.m4 b/sys/alpha/alpha/divrem.m4
index ce403f72c42b..c8a5d549d803 100644
--- a/sys/alpha/alpha/divrem.m4
+++ b/sys/alpha/alpha/divrem.m4
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* $NetBSD: divrem.m4,v 1.5 1996/10/17 04:26:25 cgd Exp $ */
-/*
+/*-
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/alpha/alpha/exception.s b/sys/alpha/alpha/exception.s
index 3359b8454351..39159b190e2d 100644
--- a/sys/alpha/alpha/exception.s
+++ b/sys/alpha/alpha/exception.s
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/alpha/alpha/gdb_machdep.c b/sys/alpha/alpha/gdb_machdep.c
index cbc38a8a9caf..37dcb726fb12 100644
--- a/sys/alpha/alpha/gdb_machdep.c
+++ b/sys/alpha/alpha/gdb_machdep.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/alpha/alpha/in_cksum.c b/sys/alpha/alpha/in_cksum.c
index 5ac80093a078..aa9d939252ae 100644
--- a/sys/alpha/alpha/in_cksum.c
+++ b/sys/alpha/alpha/in_cksum.c
@@ -1,5 +1,5 @@
/* $NetBSD: in_cksum.c,v 1.7 1997/09/02 13:18:15 thorpej Exp $ */
-/*
+/*-
* Copyright (c) 1988, 1992, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 1996
diff --git a/sys/alpha/alpha/interrupt.c b/sys/alpha/alpha/interrupt.c
index 51644bd033ea..caaf6719c2eb 100644
--- a/sys/alpha/alpha/interrupt.c
+++ b/sys/alpha/alpha/interrupt.c
@@ -1,5 +1,5 @@
/* $NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $ */
-/*
+/*-
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
* All rights reserved.
*
@@ -25,7 +25,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*/
-/*
+/*-
* Additional Copyright (c) 1997 by Matthew Jacob for NASA/Ames Research Center.
* Redistribute and modify at will, leaving only this additional copyright
* notice.
diff --git a/sys/alpha/alpha/locore.s b/sys/alpha/alpha/locore.s
index e5a7f654dc2e..d96777a71da4 100644
--- a/sys/alpha/alpha/locore.s
+++ b/sys/alpha/alpha/locore.s
@@ -26,7 +26,7 @@
* $FreeBSD$
*/
-/*
+/*-
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/alpha/alpha/machdep.c b/sys/alpha/alpha/machdep.c
index 4709bf9c0d90..9c4fc245e775 100644
--- a/sys/alpha/alpha/machdep.c
+++ b/sys/alpha/alpha/machdep.c
@@ -60,7 +60,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
-/*
+/*-
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/alpha/alpha/pal.s b/sys/alpha/alpha/pal.s
index f3714418d54a..fdf2a469562a 100644
--- a/sys/alpha/alpha/pal.s
+++ b/sys/alpha/alpha/pal.s
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/alpha/alpha/pmap.c b/sys/alpha/alpha/pmap.c
index cdb1e8e22b9e..85127cfe97f1 100644
--- a/sys/alpha/alpha/pmap.c
+++ b/sys/alpha/alpha/pmap.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1991 Regents of the University of California.
* All rights reserved.
* Copyright (c) 1994 John S. Dyson
diff --git a/sys/alpha/alpha/prom.c b/sys/alpha/alpha/prom.c
index fe0a6957b881..f33c56ae7229 100644
--- a/sys/alpha/alpha/prom.c
+++ b/sys/alpha/alpha/prom.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1992, 1994, 1995, 1996 Carnegie Mellon University
* All Rights Reserved.
*
diff --git a/sys/alpha/alpha/prom_disp.s b/sys/alpha/alpha/prom_disp.s
index c61e4f2212fe..1fb4ff76b934 100644
--- a/sys/alpha/alpha/prom_disp.s
+++ b/sys/alpha/alpha/prom_disp.s
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/alpha/alpha/promcons.c b/sys/alpha/alpha/promcons.c
index 30db04d0a307..5e9c9b830bfc 100644
--- a/sys/alpha/alpha/promcons.c
+++ b/sys/alpha/alpha/promcons.c
@@ -1,5 +1,5 @@
/* $NetBSD: promcons.c,v 1.13 1998/03/21 22:52:59 mycroft Exp $ */
-/*
+/*-
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/alpha/alpha/support.s b/sys/alpha/alpha/support.s
index a340d7514ec6..b2b7cf438277 100644
--- a/sys/alpha/alpha/support.s
+++ b/sys/alpha/alpha/support.s
@@ -26,7 +26,7 @@
* $FreeBSD$
*/
-/*
+/*-
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/alpha/alpha/trap.c b/sys/alpha/alpha/trap.c
index 634a0cd9e5b5..0678920ef6c1 100644
--- a/sys/alpha/alpha/trap.c
+++ b/sys/alpha/alpha/trap.c
@@ -1,5 +1,5 @@
/* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */
-/*
+/*-
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/alpha/alpha/uio_machdep.c b/sys/alpha/alpha/uio_machdep.c
index 7116364f3db7..a96c3982b586 100644
--- a/sys/alpha/alpha/uio_machdep.c
+++ b/sys/alpha/alpha/uio_machdep.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2004 Alan L. Cox <alc@cs.rice.edu>
* Copyright (c) 1982, 1986, 1991, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/alpha/alpha/vm_machdep.c b/sys/alpha/alpha/vm_machdep.c
index e77e0fed633e..3536d2906de1 100644
--- a/sys/alpha/alpha/vm_machdep.c
+++ b/sys/alpha/alpha/vm_machdep.c
@@ -39,7 +39,7 @@
* from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91
* Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
*/
-/*
+/*-
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/alpha/include/_limits.h b/sys/alpha/include/_limits.h
index bd0886b9c85c..6e9b5672a301 100644
--- a/sys/alpha/include/_limits.h
+++ b/sys/alpha/include/_limits.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/alpha/include/alpha_cpu.h b/sys/alpha/include/alpha_cpu.h
index 32b00ffaf10a..a3b4dfc281c1 100644
--- a/sys/alpha/include/alpha_cpu.h
+++ b/sys/alpha/include/alpha_cpu.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* From: NetBSD: alpha_cpu.h,v 1.15 1997/09/20 19:02:34 mjacob Exp */
-/*
+/*-
* Copyright (c) 1996 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/alpha/include/asm.h b/sys/alpha/include/asm.h
index 20253de247c1..3ddaf81f338e 100644
--- a/sys/alpha/include/asm.h
+++ b/sys/alpha/include/asm.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1991,1990,1989,1994,1995,1996 Carnegie Mellon University
* All Rights Reserved.
*
diff --git a/sys/alpha/include/bootinfo.h b/sys/alpha/include/bootinfo.h
index 07484b26151d..1548cd0dffbe 100644
--- a/sys/alpha/include/bootinfo.h
+++ b/sys/alpha/include/bootinfo.h
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/alpha/include/bus.h b/sys/alpha/include/bus.h
index 4fe12862b684..5246ba19c7e5 100644
--- a/sys/alpha/include/bus.h
+++ b/sys/alpha/include/bus.h
@@ -37,7 +37,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-/*
+/*-
* Copyright (c) 1996 Charles M. Hannum. All rights reserved.
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
*
diff --git a/sys/alpha/include/bus_memio.h b/sys/alpha/include/bus_memio.h
index f111ca9a7ba5..d0b0ba38a617 100644
--- a/sys/alpha/include/bus_memio.h
+++ b/sys/alpha/include/bus_memio.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997 Justin Gibbs.
* All rights reserved.
*
diff --git a/sys/alpha/include/bus_pio.h b/sys/alpha/include/bus_pio.h
index 1e437c86a66e..f51bf436642b 100644
--- a/sys/alpha/include/bus_pio.h
+++ b/sys/alpha/include/bus_pio.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997 Justin Gibbs.
* All rights reserved.
*
diff --git a/sys/alpha/include/clock.h b/sys/alpha/include/clock.h
index b3f2e45b54c5..31eca15fda0d 100644
--- a/sys/alpha/include/clock.h
+++ b/sys/alpha/include/clock.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Kernel interface to machine-dependent clock driver.
* Garrett Wollman, September 1994.
* This file is in the public domain.
diff --git a/sys/alpha/include/clockvar.h b/sys/alpha/include/clockvar.h
index f13d1dff3977..89b3619af108 100644
--- a/sys/alpha/include/clockvar.h
+++ b/sys/alpha/include/clockvar.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* $NetBSD: clockvar.h,v 1.4 1997/06/22 08:02:18 jonathan Exp $ */
-/*
+/*-
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/alpha/include/cpu.h b/sys/alpha/include/cpu.h
index 98577307f16b..212ced04e3b0 100644
--- a/sys/alpha/include/cpu.h
+++ b/sys/alpha/include/cpu.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* From: NetBSD: cpu.h,v 1.18 1997/09/23 23:17:49 mjacob Exp */
-/*
+/*-
* Copyright (c) 1988 University of Utah.
* Copyright (c) 1982, 1990, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/alpha/include/cpuconf.h b/sys/alpha/include/cpuconf.h
index 6ca8daf6832c..566ccec1df85 100644
--- a/sys/alpha/include/cpuconf.h
+++ b/sys/alpha/include/cpuconf.h
@@ -2,7 +2,7 @@
/* $NetBSD: cpuconf.h,v 1.7 1997/11/06 00:42:03 thorpej Exp $ */
#ifndef _ALPHA_CPUCONF_H
#define _ALPHA_CPUCONF_H
-/*
+/*-
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -31,7 +31,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/*
+/*-
* Additional reworking by Matthew Jacob for NASA/Ames Research Center.
* Copyright (c) 1997
*/
diff --git a/sys/alpha/include/db_machdep.h b/sys/alpha/include/db_machdep.h
index 3f130ab1b94b..f72b2b0aafb4 100644
--- a/sys/alpha/include/db_machdep.h
+++ b/sys/alpha/include/db_machdep.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* $NetBSD: db_machdep.h,v 1.6 1997/09/06 02:02:25 thorpej Exp $ */
-/*
+/*-
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/alpha/include/exec.h b/sys/alpha/include/exec.h
index 4a964e790779..2a8ba45af53e 100644
--- a/sys/alpha/include/exec.h
+++ b/sys/alpha/include/exec.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
*
diff --git a/sys/alpha/include/float.h b/sys/alpha/include/float.h
index b2bfa110c936..e2fb31d9dd85 100644
--- a/sys/alpha/include/float.h
+++ b/sys/alpha/include/float.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* From: NetBSD: float.h,v 1.6 1997/07/17 21:36:03 thorpej Exp */
-/*
+/*-
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/alpha/include/floatingpoint.h b/sys/alpha/include/floatingpoint.h
index e2faa5efd1a4..22a9f485dba6 100644
--- a/sys/alpha/include/floatingpoint.h
+++ b/sys/alpha/include/floatingpoint.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
*
diff --git a/sys/alpha/include/frame.h b/sys/alpha/include/frame.h
index 7b25696d841d..050f383d8e6d 100644
--- a/sys/alpha/include/frame.h
+++ b/sys/alpha/include/frame.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* From: NetBSD: frame.h,v 1.4 1997/04/06 08:47:27 cgd Exp */
-/*
+/*-
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/alpha/include/gdb_machdep.h b/sys/alpha/include/gdb_machdep.h
index 5ca5d69f5890..606589fc25aa 100644
--- a/sys/alpha/include/gdb_machdep.h
+++ b/sys/alpha/include/gdb_machdep.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/alpha/include/ieee.h b/sys/alpha/include/ieee.h
index 53d5cff6ea0b..0b1f6312bead 100644
--- a/sys/alpha/include/ieee.h
+++ b/sys/alpha/include/ieee.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* From: NetBSD: ieee.h,v 1.2 1997/04/06 08:47:27 cgd Exp */
-/*
+/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/alpha/include/ieeefp.h b/sys/alpha/include/ieeefp.h
index d6735075bc9f..6fb419ec0e7f 100644
--- a/sys/alpha/include/ieeefp.h
+++ b/sys/alpha/include/ieeefp.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* From: NetBSD: ieeefp.h,v 1.2 1997/04/06 08:47:28 cgd Exp */
-/*
+/*-
* Written by J.T. Conklin, Apr 28, 1995
* Public domain.
*/
diff --git a/sys/alpha/include/intrcnt.h b/sys/alpha/include/intrcnt.h
index 4f7dcf463333..2c1b897d4724 100644
--- a/sys/alpha/include/intrcnt.h
+++ b/sys/alpha/include/intrcnt.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* $NetBSD: intrcnt.h,v 1.17 1998/11/19 01:48:04 ross Exp $ */
-/*
+/*-
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/alpha/include/kdb.h b/sys/alpha/include/kdb.h
index 849b140b4bff..ded9cd6c079a 100644
--- a/sys/alpha/include/kdb.h
+++ b/sys/alpha/include/kdb.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/alpha/include/limits.h b/sys/alpha/include/limits.h
index 59071c82351a..a02c8e18e4c4 100644
--- a/sys/alpha/include/limits.h
+++ b/sys/alpha/include/limits.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/alpha/include/pal.h b/sys/alpha/include/pal.h
index b3393ce70c5a..73426af911ab 100644
--- a/sys/alpha/include/pal.h
+++ b/sys/alpha/include/pal.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* From: NetBSD: pal.h,v 1.1 1997/09/06 01:23:53 thorpej Exp */
-/*
+/*-
* Copyright (c) 1991,1990,1989,1994,1995,1996 Carnegie Mellon University
* All Rights Reserved.
*
diff --git a/sys/alpha/include/param.h b/sys/alpha/include/param.h
index 1a9c9af545a5..13e8b8f5044d 100644
--- a/sys/alpha/include/param.h
+++ b/sys/alpha/include/param.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* From: NetBSD: param.h,v 1.20 1997/09/19 13:52:53 leo Exp */
-/*
+/*-
* Copyright (c) 1988 University of Utah.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -117,7 +117,6 @@
#define KSTACK_PAGES 2 /* pages of kstack (with pcb) */
#endif
#define KSTACK_GUARD_PAGES 1 /* pages of kstack guard; 0 disables */
-#define UAREA_PAGES 1 /* pages of u-area */
/*
diff --git a/sys/alpha/include/pcb.h b/sys/alpha/include/pcb.h
index 4375ef2f66db..70646c8fefba 100644
--- a/sys/alpha/include/pcb.h
+++ b/sys/alpha/include/pcb.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* From: NetBSD: pcb.h,v 1.6 1997/04/06 08:47:33 cgd Exp */
-/*
+/*-
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/alpha/include/pmap.h b/sys/alpha/include/pmap.h
index 66aa9b4a3714..56c9d6a92811 100644
--- a/sys/alpha/include/pmap.h
+++ b/sys/alpha/include/pmap.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1991 Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/alpha/include/proc.h b/sys/alpha/include/proc.h
index 754ccb02202d..be3948aa9352 100644
--- a/sys/alpha/include/proc.h
+++ b/sys/alpha/include/proc.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* From: NetBSD: proc.h,v 1.3 1997/04/06 08:47:36 cgd Exp */
-/*
+/*-
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/alpha/include/profile.h b/sys/alpha/include/profile.h
index 2cb16c55a66b..47f45eb18a7a 100644
--- a/sys/alpha/include/profile.h
+++ b/sys/alpha/include/profile.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* From: NetBSD: profile.h,v 1.9 1997/04/06 08:47:37 cgd Exp */
-/*
+/*-
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/alpha/include/prom.h b/sys/alpha/include/prom.h
index 05cb4fb7032a..a3ce282808fb 100644
--- a/sys/alpha/include/prom.h
+++ b/sys/alpha/include/prom.h
@@ -1,6 +1,6 @@
/* $NetBSD: prom.h,v 1.7 1997/04/06 08:47:37 cgd Exp $ */
-/*
+/*-
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/alpha/include/pte.h b/sys/alpha/include/pte.h
index 6899dde5116d..1ac4e94c182f 100644
--- a/sys/alpha/include/pte.h
+++ b/sys/alpha/include/pte.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* From: NetBSD: pte.h,v 1.10 1997/09/02 19:07:22 thorpej Exp */
-/*
+/*-
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/alpha/include/ptrace.h b/sys/alpha/include/ptrace.h
index 7f74278357f0..657800cbd217 100644
--- a/sys/alpha/include/ptrace.h
+++ b/sys/alpha/include/ptrace.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/alpha/include/reg.h b/sys/alpha/include/reg.h
index 6e1b1d3c26e6..573f82593c98 100644
--- a/sys/alpha/include/reg.h
+++ b/sys/alpha/include/reg.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* From: NetBSD: reg.h,v 1.3 1997/04/06 08:47:40 cgd Exp */
-/*
+/*-
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/alpha/include/reloc.h b/sys/alpha/include/reloc.h
index a8ce0b106ab0..6e5053602772 100644
--- a/sys/alpha/include/reloc.h
+++ b/sys/alpha/include/reloc.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
* All rights reserved.
*
diff --git a/sys/alpha/include/resource.h b/sys/alpha/include/resource.h
index 28fcc98ea1be..edde5eb29908 100644
--- a/sys/alpha/include/resource.h
+++ b/sys/alpha/include/resource.h
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* Copyright 1998 Massachusetts Institute of Technology
*
* Permission to use, copy, modify, and distribute this software and
diff --git a/sys/alpha/include/rpb.h b/sys/alpha/include/rpb.h
index da08b96cf298..0dd44812b9b3 100644
--- a/sys/alpha/include/rpb.h
+++ b/sys/alpha/include/rpb.h
@@ -1,7 +1,7 @@
/* $NetBSD: rpb.h,v 1.20 1998/04/15 00:47:33 mjacob Exp $ */
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/alpha/include/runq.h b/sys/alpha/include/runq.h
index 9f844b69fe5f..6d03646fd539 100644
--- a/sys/alpha/include/runq.h
+++ b/sys/alpha/include/runq.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001 Jake Burkholder <jake@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/alpha/include/signal.h b/sys/alpha/include/signal.h
index 37a969efb5e9..7e91ed8ae47e 100644
--- a/sys/alpha/include/signal.h
+++ b/sys/alpha/include/signal.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* From: NetBSD: signal.h,v 1.3 1997/04/06 08:47:43 cgd Exp */
-/*
+/*-
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/alpha/include/smp.h b/sys/alpha/include/smp.h
index ae0f70f56f74..9660d098ee6b 100644
--- a/sys/alpha/include/smp.h
+++ b/sys/alpha/include/smp.h
@@ -1,4 +1,4 @@
-/*
+/*-
* ----------------------------------------------------------------------------
* "THE BEER-WARE LICENSE" (Revision 42):
* <phk@FreeBSD.org> wrote this file. As long as you retain this notice you
diff --git a/sys/alpha/include/vmparam.h b/sys/alpha/include/vmparam.h
index ab2562aad899..57a116bdd8e5 100644
--- a/sys/alpha/include/vmparam.h
+++ b/sys/alpha/include/vmparam.h
@@ -2,7 +2,7 @@
/* From: NetBSD: vmparam.h,v 1.6 1997/09/23 23:23:23 mjacob Exp */
#ifndef _ALPHA_VMPARAM_H
#define _ALPHA_VMPARAM_H
-/*
+/*-
* Copyright (c) 1988 University of Utah.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/alpha/isa/mcclock_isa.c b/sys/alpha/isa/mcclock_isa.c
index edfb51737031..3cddfa578ec2 100644
--- a/sys/alpha/isa/mcclock_isa.c
+++ b/sys/alpha/isa/mcclock_isa.c
@@ -1,5 +1,5 @@
/* $NetBSD: mcclock_tlsb.c,v 1.8 1998/05/13 02:50:29 thorpej Exp $ */
-/*
+/*-
* Copyright (c) 1997 by Matthew Jacob
* NASA AMES Research Center.
* All rights reserved.
diff --git a/sys/alpha/mcbus/mcbus.c b/sys/alpha/mcbus/mcbus.c
index 7046b2bbca5e..48bf47bdaf13 100644
--- a/sys/alpha/mcbus/mcbus.c
+++ b/sys/alpha/mcbus/mcbus.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000 by Matthew Jacob
* All rights reserved.
*
diff --git a/sys/alpha/mcbus/mcbusreg.h b/sys/alpha/mcbus/mcbusreg.h
index 5130d0eb2f98..d52c1a5b3e02 100644
--- a/sys/alpha/mcbus/mcbusreg.h
+++ b/sys/alpha/mcbus/mcbusreg.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 1998, 2000 by Matthew Jacob
* All rights reserved.
*
diff --git a/sys/alpha/mcbus/mcbusvar.h b/sys/alpha/mcbus/mcbusvar.h
index 50d9da936fa9..63e8d27e9659 100644
--- a/sys/alpha/mcbus/mcbusvar.h
+++ b/sys/alpha/mcbus/mcbusvar.h
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 2000 by Matthew Jacob
* All rights reserved.
*
diff --git a/sys/alpha/mcbus/mcmem.c b/sys/alpha/mcbus/mcmem.c
index e979959d292d..bd3a784d83ed 100644
--- a/sys/alpha/mcbus/mcmem.c
+++ b/sys/alpha/mcbus/mcmem.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000 by Matthew Jacob
* All rights reserved.
*
diff --git a/sys/alpha/mcbus/mcpcia.c b/sys/alpha/mcbus/mcpcia.c
index 0761bc036338..6059f37ca69c 100644
--- a/sys/alpha/mcbus/mcpcia.c
+++ b/sys/alpha/mcbus/mcpcia.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000 Matthew Jacob
* All rights reserved.
*
diff --git a/sys/alpha/mcbus/mcpciareg.h b/sys/alpha/mcbus/mcpciareg.h
index 75ae6987fdb4..ae477fd4f5d9 100644
--- a/sys/alpha/mcbus/mcpciareg.h
+++ b/sys/alpha/mcbus/mcpciareg.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 2000 by Matthew Jacob
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/alpha/mcbus/mcpciavar.h b/sys/alpha/mcbus/mcpciavar.h
index 7bbae1b9a484..00c1adaba8b6 100644
--- a/sys/alpha/mcbus/mcpciavar.h
+++ b/sys/alpha/mcbus/mcpciavar.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 1998, 2000 by Matthew Jacob
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/alpha/osf1/exec_ecoff.h b/sys/alpha/osf1/exec_ecoff.h
index 246fa48bde69..b88861299cf8 100644
--- a/sys/alpha/osf1/exec_ecoff.h
+++ b/sys/alpha/osf1/exec_ecoff.h
@@ -1,6 +1,6 @@
/* $NetBSD: exec_ecoff.h,v 1.10 1996/09/26 22:39:14 cgd Exp $ */
-/*
+/*-
* Copyright (c) 1994 Adam Glass
* All rights reserved.
*
diff --git a/sys/alpha/osf1/imgact_osf1.c b/sys/alpha/osf1/imgact_osf1.c
index 3bf9473a053d..40520a0dd792 100644
--- a/sys/alpha/osf1/imgact_osf1.c
+++ b/sys/alpha/osf1/imgact_osf1.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998-1999 Andrew Gallatin
* All rights reserved.
*
diff --git a/sys/alpha/osf1/osf1.h b/sys/alpha/osf1/osf1.h
index c8bf275cb716..41592d928f2a 100644
--- a/sys/alpha/osf1/osf1.h
+++ b/sys/alpha/osf1/osf1.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998-1999 Andrew Gallatin
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/alpha/osf1/osf1_ioctl.c b/sys/alpha/osf1/osf1_ioctl.c
index 1b4a6b1513e2..09d970dc1d52 100644
--- a/sys/alpha/osf1/osf1_ioctl.c
+++ b/sys/alpha/osf1/osf1_ioctl.c
@@ -1,5 +1,5 @@
/* $NetBSD: osf1_ioctl.c,v 1.5 1996/10/13 00:46:53 christos Exp $ */
-/*
+/*-
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/alpha/osf1/osf1_misc.c b/sys/alpha/osf1/osf1_misc.c
index 9cebf524dbfb..f82af3766eb8 100644
--- a/sys/alpha/osf1/osf1_misc.c
+++ b/sys/alpha/osf1/osf1_misc.c
@@ -1,5 +1,5 @@
/* $NetBSD: osf1_misc.c,v 1.14 1998/05/20 16:34:29 chs Exp $ */
-/*
+/*-
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/alpha/osf1/osf1_mount.c b/sys/alpha/osf1/osf1_mount.c
index def2e170a957..d51bc43e7a7c 100644
--- a/sys/alpha/osf1/osf1_mount.c
+++ b/sys/alpha/osf1/osf1_mount.c
@@ -1,5 +1,5 @@
/* $NetBSD: osf1_mount.c,v 1.7 1998/05/20 16:34:29 chs Exp $ */
-/*
+/*-
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/alpha/osf1/osf1_signal.c b/sys/alpha/osf1/osf1_signal.c
index 0aecf0170f62..6f8187692f7a 100644
--- a/sys/alpha/osf1/osf1_signal.c
+++ b/sys/alpha/osf1/osf1_signal.c
@@ -1,6 +1,6 @@
/* $NetBSD: osf1_signal.c,v 1.4 1998/05/20 16:35:01 chs Exp $
*/
-/*
+/*-
* Copyright (c) 1998-1999 Andrew Gallatin
*
* Taken from NetBSD's sys/compat/osf1/osf1_signal.c, which at the
diff --git a/sys/alpha/pci/alphapci_if.m b/sys/alpha/pci/alphapci_if.m
index 1525af9877bb..32b0b5defbcb 100644
--- a/sys/alpha/pci/alphapci_if.m
+++ b/sys/alpha/pci/alphapci_if.m
@@ -1,4 +1,4 @@
-#
+#-
# Copyright (c) 2000 Doug Rabson
# All rights reserved.
#
diff --git a/sys/alpha/pci/apecs.c b/sys/alpha/pci/apecs.c
index e6e56f47d012..3faf1e1ae826 100644
--- a/sys/alpha/pci/apecs.c
+++ b/sys/alpha/pci/apecs.c
@@ -24,7 +24,7 @@
* SUCH DAMAGE.
*
*/
-/*
+/*-
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
* All rights reserved.
*
@@ -50,7 +50,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*/
-/*
+/*-
* Additional Copyright (c) 1998 by Andrew Gallatin for Duke University
*/
diff --git a/sys/alpha/pci/apecsreg.h b/sys/alpha/pci/apecsreg.h
index 385df1e4801a..a9e180b507f8 100644
--- a/sys/alpha/pci/apecsreg.h
+++ b/sys/alpha/pci/apecsreg.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* $NetBSD: apecsreg.h,v 1.7 1997/06/06 23:54:24 thorpej Exp $ */
-/*
+/*-
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/alpha/pci/cia.c b/sys/alpha/pci/cia.c
index cced5054fe8c..91deb356acd4 100644
--- a/sys/alpha/pci/cia.c
+++ b/sys/alpha/pci/cia.c
@@ -59,7 +59,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
-/*
+/*-
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/alpha/pci/cia_pci.c b/sys/alpha/pci/cia_pci.c
index f2fc5d4c669d..69fd4f3c7242 100644
--- a/sys/alpha/pci/cia_pci.c
+++ b/sys/alpha/pci/cia_pci.c
@@ -60,7 +60,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
-/*
+/*-
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/alpha/pci/ciareg.h b/sys/alpha/pci/ciareg.h
index 8da36a401ed1..4b5d153b5149 100644
--- a/sys/alpha/pci/ciareg.h
+++ b/sys/alpha/pci/ciareg.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* $NetBSD: ciareg.h,v 1.22 1998/06/06 20:40:14 thorpej Exp $ */
-/*
+/*-
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/alpha/pci/lcareg.h b/sys/alpha/pci/lcareg.h
index d7fe568d1b0a..c79a991b9b55 100644
--- a/sys/alpha/pci/lcareg.h
+++ b/sys/alpha/pci/lcareg.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* $NetBSD: lcareg.h,v 1.8 1997/09/05 02:14:31 thorpej Exp $ */
-/*
+/*-
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/alpha/pci/pci_eb164_intr.s b/sys/alpha/pci/pci_eb164_intr.s
index 089f79d7a0a3..542839feea86 100644
--- a/sys/alpha/pci/pci_eb164_intr.s
+++ b/sys/alpha/pci/pci_eb164_intr.s
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* $NetBSD: pci_eb164_intr.s,v 1.5 1997/09/02 13:19:42 thorpej Exp $ */
-/*
+/*-
* Copyright (c) 1996 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/alpha/pci/pci_eb64plus_intr.s b/sys/alpha/pci/pci_eb64plus_intr.s
index 9e69223960f5..ce33c2a3b401 100644
--- a/sys/alpha/pci/pci_eb64plus_intr.s
+++ b/sys/alpha/pci/pci_eb64plus_intr.s
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* $NetBSD: pci_eb64plus_intr.s,v 1.2 1997/09/02 13:19:43 thorpej Exp $ */
-/*
+/*-
* Copyright (c) 1996 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/alpha/pci/pcibus.c b/sys/alpha/pci/pcibus.c
index a6102e40f558..03fc77c02ba9 100644
--- a/sys/alpha/pci/pcibus.c
+++ b/sys/alpha/pci/pcibus.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
* All rights reserved.
*
diff --git a/sys/alpha/pci/t2.c b/sys/alpha/pci/t2.c
index 7efa27aa77cd..b1c0b266a117 100644
--- a/sys/alpha/pci/t2.c
+++ b/sys/alpha/pci/t2.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000 Andrew Gallatin & Doug Rabson
* All rights reserved.
*
diff --git a/sys/alpha/pci/t2reg.h b/sys/alpha/pci/t2reg.h
index 86f04e93967d..b8052018cb6b 100644
--- a/sys/alpha/pci/t2reg.h
+++ b/sys/alpha/pci/t2reg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000 Doug Rabson & Andrew Gallatin
* All rights reserved.
*
diff --git a/sys/alpha/tlsb/dwlpx.c b/sys/alpha/tlsb/dwlpx.c
index 74b19bb03aeb..e95f10e5711f 100644
--- a/sys/alpha/tlsb/dwlpx.c
+++ b/sys/alpha/tlsb/dwlpx.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/*
+/*-
* Based very closely on NetBSD version-
*
* Copyright (c) 1997 by Matthew Jacob
diff --git a/sys/alpha/tlsb/dwlpxreg.h b/sys/alpha/tlsb/dwlpxreg.h
index 9bce1f591b07..826af3269be7 100644
--- a/sys/alpha/tlsb/dwlpxreg.h
+++ b/sys/alpha/tlsb/dwlpxreg.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* $NetBSD: dwlpxreg.h,v 1.9 1998/03/21 22:02:42 mjacob Exp $ */
-/*
+/*-
* Copyright (c) 1997, 2000 by Matthew Jacob
* NASA AMES Research Center.
* All rights reserved.
diff --git a/sys/alpha/tlsb/dwlpxvar.h b/sys/alpha/tlsb/dwlpxvar.h
index 4720638e1f76..7d880b1007ad 100644
--- a/sys/alpha/tlsb/dwlpxvar.h
+++ b/sys/alpha/tlsb/dwlpxvar.h
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 2000 by Matthew Jacob
* NASA AMES Research Center.
* All rights reserved.
diff --git a/sys/alpha/tlsb/gbus.c b/sys/alpha/tlsb/gbus.c
index 793901fd7bda..092423b8972c 100644
--- a/sys/alpha/tlsb/gbus.c
+++ b/sys/alpha/tlsb/gbus.c
@@ -1,5 +1,5 @@
/* $NetBSD: gbus.c,v 1.8 1998/05/13 22:13:35 thorpej Exp $ */
-/*
+/*-
* Copyright (c) 1997, 2000 by Matthew Jacob
* NASA AMES Research Center.
* All rights reserved.
diff --git a/sys/alpha/tlsb/kftxx.c b/sys/alpha/tlsb/kftxx.c
index d43d8fea6eb8..f0714e3cfcc2 100644
--- a/sys/alpha/tlsb/kftxx.c
+++ b/sys/alpha/tlsb/kftxx.c
@@ -1,5 +1,5 @@
/* $NetBSD: kftxx.c,v 1.9 1998/05/14 00:01:32 thorpej Exp $ */
-/*
+/*-
* Copyright (c) 1997, 2000 by Matthew Jacob
* NASA AMES Research Center.
* All rights reserved.
diff --git a/sys/alpha/tlsb/kftxxreg.h b/sys/alpha/tlsb/kftxxreg.h
index b4505d5d3a88..d4431d2ee56e 100644
--- a/sys/alpha/tlsb/kftxxreg.h
+++ b/sys/alpha/tlsb/kftxxreg.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* $NetBSD: kftxxreg.h,v 1.5 1998/07/08 00:45:08 mjacob Exp $ */
-/*
+/*-
* Copyright (c) 1997, 2000 by Matthew Jacob
* NASA AMES Research Center.
* All rights reserved.
diff --git a/sys/alpha/tlsb/mcclock_tlsb.c b/sys/alpha/tlsb/mcclock_tlsb.c
index fe8ab8a7b8eb..bbbaa297a5ac 100644
--- a/sys/alpha/tlsb/mcclock_tlsb.c
+++ b/sys/alpha/tlsb/mcclock_tlsb.c
@@ -1,5 +1,5 @@
/* $NetBSD: mcclock_tlsb.c,v 1.8 1998/05/13 02:50:29 thorpej Exp $ */
-/*
+/*-
* Copyright (c) 1997, 2000 by Matthew Jacob
* NASA AMES Research Center.
* All rights reserved.
diff --git a/sys/alpha/tlsb/tlsb.c b/sys/alpha/tlsb/tlsb.c
index 10e5cfce4a98..34b6686b3a7b 100644
--- a/sys/alpha/tlsb/tlsb.c
+++ b/sys/alpha/tlsb/tlsb.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, 2000 by Matthew Jacob
* NASA AMES Research Center.
* All rights reserved.
diff --git a/sys/alpha/tlsb/tlsbcpu.c b/sys/alpha/tlsb/tlsbcpu.c
index 9d85de1c374f..68fa84aef18a 100644
--- a/sys/alpha/tlsb/tlsbcpu.c
+++ b/sys/alpha/tlsb/tlsbcpu.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, 2000 by Matthew Jacob
* NASA AMES Research Center.
* All rights reserved.
diff --git a/sys/alpha/tlsb/tlsbmem.c b/sys/alpha/tlsb/tlsbmem.c
index de8326893fa8..778601f297f7 100644
--- a/sys/alpha/tlsb/tlsbmem.c
+++ b/sys/alpha/tlsb/tlsbmem.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, 2000 by Matthew Jacob
* NASA AMES Research Center.
* All rights reserved.
diff --git a/sys/alpha/tlsb/tlsbreg.h b/sys/alpha/tlsb/tlsbreg.h
index 478865d5bbf4..cfff1c82e5c7 100644
--- a/sys/alpha/tlsb/tlsbreg.h
+++ b/sys/alpha/tlsb/tlsbreg.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* $NetBSD: tlsbreg.h,v 1.5 2000/01/27 22:27:50 mjacob Exp $ */
-/*
+/*-
* Copyright (c) 1997, 2000 by Matthew Jacob
* NASA AMES Research Center.
* All rights reserved.
diff --git a/sys/alpha/tlsb/tlsbvar.h b/sys/alpha/tlsb/tlsbvar.h
index 81fe23ccad42..238f9082b092 100644
--- a/sys/alpha/tlsb/tlsbvar.h
+++ b/sys/alpha/tlsb/tlsbvar.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* $NetBSD: tlsbvar.h,v 1.5 1998/05/13 23:23:23 thorpej Exp $ */
-/*
+/*-
* Copyright (c) 1997, 2000 by Matthew Jacob
* NASA AMES Research Center.
* All rights reserved.
diff --git a/sys/amd64/amd64/busdma_machdep.c b/sys/amd64/amd64/busdma_machdep.c
index a82dfded5493..1654c1cda5f4 100644
--- a/sys/amd64/amd64/busdma_machdep.c
+++ b/sys/amd64/amd64/busdma_machdep.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, 1998 Justin T. Gibbs.
* All rights reserved.
*
diff --git a/sys/amd64/amd64/db_disasm.c b/sys/amd64/amd64/db_disasm.c
index e4c227d663ed..66a3c4bfcbc9 100644
--- a/sys/amd64/amd64/db_disasm.c
+++ b/sys/amd64/amd64/db_disasm.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* All Rights Reserved.
diff --git a/sys/amd64/amd64/db_interface.c b/sys/amd64/amd64/db_interface.c
index 27fc3b35e96c..b2976167bd6b 100644
--- a/sys/amd64/amd64/db_interface.c
+++ b/sys/amd64/amd64/db_interface.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* All Rights Reserved.
diff --git a/sys/amd64/amd64/db_trace.c b/sys/amd64/amd64/db_trace.c
index fb80d290bd99..995f5a668c7f 100644
--- a/sys/amd64/amd64/db_trace.c
+++ b/sys/amd64/amd64/db_trace.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* All Rights Reserved.
diff --git a/sys/amd64/amd64/gdb_machdep.c b/sys/amd64/amd64/gdb_machdep.c
index 820824b1731a..788b25549659 100644
--- a/sys/amd64/amd64/gdb_machdep.c
+++ b/sys/amd64/amd64/gdb_machdep.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/amd64/amd64/in_cksum.c b/sys/amd64/amd64/in_cksum.c
index 159d0d9667d2..ae02e91d9203 100644
--- a/sys/amd64/amd64/in_cksum.c
+++ b/sys/amd64/amd64/in_cksum.c
@@ -1,6 +1,6 @@
/* $NetBSD: in_cksum.c,v 1.7 1997/09/02 13:18:15 thorpej Exp $ */
-/*
+/*-
* Copyright (c) 1988, 1992, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 1996
diff --git a/sys/amd64/amd64/nexus.c b/sys/amd64/amd64/nexus.c
index cb31f911f344..1b1b6beec836 100644
--- a/sys/amd64/amd64/nexus.c
+++ b/sys/amd64/amd64/nexus.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright 1998 Massachusetts Institute of Technology
*
* Permission to use, copy, modify, and distribute this software and
diff --git a/sys/amd64/amd64/uio_machdep.c b/sys/amd64/amd64/uio_machdep.c
index 81c74924d90e..d3897cf14d9a 100644
--- a/sys/amd64/amd64/uio_machdep.c
+++ b/sys/amd64/amd64/uio_machdep.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2004 Alan L. Cox <alc@cs.rice.edu>
* Copyright (c) 1982, 1986, 1991, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/amd64/include/_limits.h b/sys/amd64/include/_limits.h
index 330e86e98d10..fdea69e353e7 100644
--- a/sys/amd64/include/_limits.h
+++ b/sys/amd64/include/_limits.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/amd64/include/apicreg.h b/sys/amd64/include/apicreg.h
index 7b584a075e05..c451b7157cc9 100644
--- a/sys/amd64/include/apicreg.h
+++ b/sys/amd64/include/apicreg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1996, by Peter Wemm and Steve Passe
* All rights reserved.
*
diff --git a/sys/amd64/include/bus_amd64.h b/sys/amd64/include/bus_amd64.h
index b0bc61b6096a..189816bd0481 100644
--- a/sys/amd64/include/bus_amd64.h
+++ b/sys/amd64/include/bus_amd64.h
@@ -37,7 +37,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-/*
+/*-
* Copyright (c) 1996 Charles M. Hannum. All rights reserved.
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
*
diff --git a/sys/amd64/include/bus_dma.h b/sys/amd64/include/bus_dma.h
index 7b94b88f716d..67e84ec218c5 100644
--- a/sys/amd64/include/bus_dma.h
+++ b/sys/amd64/include/bus_dma.h
@@ -37,7 +37,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-/*
+/*-
* Copyright (c) 1996 Charles M. Hannum. All rights reserved.
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
*
diff --git a/sys/amd64/include/bus_memio.h b/sys/amd64/include/bus_memio.h
index 96607037f3d2..6a0d4f8a95dc 100644
--- a/sys/amd64/include/bus_memio.h
+++ b/sys/amd64/include/bus_memio.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997 Justin Gibbs.
* All rights reserved.
*
diff --git a/sys/amd64/include/bus_pio.h b/sys/amd64/include/bus_pio.h
index 87aeebe0cb66..2044adf07637 100644
--- a/sys/amd64/include/bus_pio.h
+++ b/sys/amd64/include/bus_pio.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997 Justin Gibbs.
* All rights reserved.
*
diff --git a/sys/amd64/include/clock.h b/sys/amd64/include/clock.h
index 9e3e4e5b988e..3d0fa4a820d4 100644
--- a/sys/amd64/include/clock.h
+++ b/sys/amd64/include/clock.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Kernel interface to machine-dependent clock driver.
* Garrett Wollman, September 1994.
* This file is in the public domain.
diff --git a/sys/amd64/include/cputypes.h b/sys/amd64/include/cputypes.h
index f06aa7145b1d..6b0e8fda4681 100644
--- a/sys/amd64/include/cputypes.h
+++ b/sys/amd64/include/cputypes.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1993 Christopher G. Demetriou
* All rights reserved.
*
diff --git a/sys/amd64/include/db_machdep.h b/sys/amd64/include/db_machdep.h
index 0c57aa76877f..29e385e3af0c 100644
--- a/sys/amd64/include/db_machdep.h
+++ b/sys/amd64/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* All Rights Reserved.
diff --git a/sys/amd64/include/float.h b/sys/amd64/include/float.h
index ea2df3cc57c2..52b899f6e4ce 100644
--- a/sys/amd64/include/float.h
+++ b/sys/amd64/include/float.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1989 Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/amd64/include/gdb_machdep.h b/sys/amd64/include/gdb_machdep.h
index 458f2f6eb9b5..76e8b4ee8069 100644
--- a/sys/amd64/include/gdb_machdep.h
+++ b/sys/amd64/include/gdb_machdep.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/amd64/include/kdb.h b/sys/amd64/include/kdb.h
index 2cc6f718a965..ba359140beb7 100644
--- a/sys/amd64/include/kdb.h
+++ b/sys/amd64/include/kdb.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/amd64/include/limits.h b/sys/amd64/include/limits.h
index b7810fd22083..8e3bb11edfc3 100644
--- a/sys/amd64/include/limits.h
+++ b/sys/amd64/include/limits.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/amd64/include/metadata.h b/sys/amd64/include/metadata.h
index 32497a46f870..84e6f8739970 100644
--- a/sys/amd64/include/metadata.h
+++ b/sys/amd64/include/metadata.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003 Peter Wemm <peter@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index d56a418a5b5e..aad99ed2d7f7 100644
--- a/sys/amd64/include/mptable.h
+++ b/sys/amd64/include/mptable.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1996, by Steve Passe
* All rights reserved.
*
diff --git a/sys/amd64/include/param.h b/sys/amd64/include/param.h
index 5216c55a28dc..dd4626dc90cd 100644
--- a/sys/amd64/include/param.h
+++ b/sys/amd64/include/param.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2002 David E. O'Brien. All rights reserved.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/amd64/include/pci_cfgreg.h b/sys/amd64/include/pci_cfgreg.h
index 10cdb96ac2ce..1df8972a4447 100644
--- a/sys/amd64/include/pci_cfgreg.h
+++ b/sys/amd64/include/pci_cfgreg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
* All rights reserved.
*
diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h
index 3069a66ce5d5..c4804e9382f9 100644
--- a/sys/amd64/include/pmap.h
+++ b/sys/amd64/include/pmap.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003 Peter Wemm.
* Copyright (c) 1991 Regents of the University of California.
* All rights reserved.
diff --git a/sys/amd64/include/proc.h b/sys/amd64/include/proc.h
index 319f5af3a538..b019455e5cd1 100644
--- a/sys/amd64/include/proc.h
+++ b/sys/amd64/include/proc.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1991 Regents of the University of California.
* All rights reserved.
*
diff --git a/sys/amd64/include/profile.h b/sys/amd64/include/profile.h
index d9ed7ccc1f5e..ecd34264dcd3 100644
--- a/sys/amd64/include/profile.h
+++ b/sys/amd64/include/profile.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/amd64/include/ptrace.h b/sys/amd64/include/ptrace.h
index adfc79c9ddd2..eef24f829b48 100644
--- a/sys/amd64/include/ptrace.h
+++ b/sys/amd64/include/ptrace.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/amd64/include/resource.h b/sys/amd64/include/resource.h
index 28fcc98ea1be..edde5eb29908 100644
--- a/sys/amd64/include/resource.h
+++ b/sys/amd64/include/resource.h
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* Copyright 1998 Massachusetts Institute of Technology
*
* Permission to use, copy, modify, and distribute this software and
diff --git a/sys/amd64/include/runq.h b/sys/amd64/include/runq.h
index 0f2f4ef799c3..855e315b6847 100644
--- a/sys/amd64/include/runq.h
+++ b/sys/amd64/include/runq.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001 Jake Burkholder <jake@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/amd64/include/signal.h b/sys/amd64/include/signal.h
index fe8c57f15d6e..412a34f2f817 100644
--- a/sys/amd64/include/signal.h
+++ b/sys/amd64/include/signal.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003 Peter Wemm.
* Copyright (c) 1986, 1989, 1991, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/amd64/include/smp.h b/sys/amd64/include/smp.h
index f61e9597f12d..5f510bb92d9b 100644
--- a/sys/amd64/include/smp.h
+++ b/sys/amd64/include/smp.h
@@ -1,4 +1,4 @@
-/*
+/*-
* ----------------------------------------------------------------------------
* "THE BEER-WARE LICENSE" (Revision 42):
* <phk@FreeBSD.org> wrote this file. As long as you retain this notice you
diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c
index bf1ae4ebea1f..a0cd3ba5136f 100644
--- a/sys/amd64/isa/isa.c
+++ b/sys/amd64/isa/isa.c
@@ -27,7 +27,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-/*
+/*-
* Modifications for Intel architecture by Garrett A. Wollman.
* Copyright 1998 Massachusetts Institute of Technology
*
diff --git a/sys/amd64/pci/pci_bus.c b/sys/amd64/pci/pci_bus.c
index 3611b1b17fba..320eb8291453 100644
--- a/sys/amd64/pci/pci_bus.c
+++ b/sys/amd64/pci/pci_bus.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
* All rights reserved.
*
diff --git a/sys/amd64/pci/pci_cfgreg.c b/sys/amd64/pci/pci_cfgreg.c
index e92d02c2b499..29581db847d8 100644
--- a/sys/amd64/pci/pci_cfgreg.c
+++ b/sys/amd64/pci/pci_cfgreg.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
* Copyright (c) 2000, Michael Smith <msmith@freebsd.org>
* Copyright (c) 2000, BSDi
diff --git a/sys/boot/efi/include/README b/sys/boot/efi/include/README
index 151bac9737d0..bf821fae7e60 100644
--- a/sys/boot/efi/include/README
+++ b/sys/boot/efi/include/README
@@ -1,4 +1,5 @@
/* $FreeBSD$ */
+/*-
Files in this directory and subdirectories are subject to the following
copyright unless superceded or supplemented by additional specific license
@@ -31,3 +32,5 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE. THE EFI SPECIFICATION AND ALL
OTHER INFORMATION ON THIS WEB SITE ARE PROVIDED "AS IS" WITH NO
WARRANTIES, AND ARE SUBJECT TO CHANGE WITHOUT NOTICE.
+
+*/
diff --git a/sys/boot/efi/libefi/efiboot.h b/sys/boot/efi/libefi/efiboot.h
index 18af3f4bc087..d93213b77885 100644
--- a/sys/boot/efi/libefi/efiboot.h
+++ b/sys/boot/efi/libefi/efiboot.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1996
* Matthias Drochner. All rights reserved.
*
diff --git a/sys/boot/efi/libefi/time.c b/sys/boot/efi/libefi/time.c
index 3ca456e22b9b..4cdba6be81b4 100644
--- a/sys/boot/efi/libefi/time.c
+++ b/sys/boot/efi/libefi/time.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999, 2000
* Intel Corporation.
* All rights reserved.
diff --git a/sys/boot/ofw/libofw/libofw.h b/sys/boot/ofw/libofw/libofw.h
index f3a2d8c05423..df2cd5133ca3 100644
--- a/sys/boot/ofw/libofw/libofw.h
+++ b/sys/boot/ofw/libofw/libofw.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (C) 2000 Benno Rice.
* All rights reserved.
*
diff --git a/sys/boot/ofw/libofw/ofw_console.c b/sys/boot/ofw/libofw/ofw_console.c
index a0c9f023fa8e..67333ff106fa 100644
--- a/sys/boot/ofw/libofw/ofw_console.c
+++ b/sys/boot/ofw/libofw/ofw_console.c
@@ -1,6 +1,6 @@
/* $NetBSD: prom.c,v 1.3 1997/09/06 14:03:58 drochner Exp $ */
-/*
+/*-
* Mach Operating System
* Copyright (c) 1992 Carnegie Mellon University
* All Rights Reserved.
diff --git a/sys/boot/ofw/libofw/ofw_disk.c b/sys/boot/ofw/libofw/ofw_disk.c
index d241aed19d28..dfeafe05d4b5 100644
--- a/sys/boot/ofw/libofw/ofw_disk.c
+++ b/sys/boot/ofw/libofw/ofw_disk.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (C) 2000 Benno Rice.
* All rights reserved.
*
diff --git a/sys/boot/ofw/libofw/ofw_memory.c b/sys/boot/ofw/libofw/ofw_memory.c
index 5239fa2be8ee..90e98af89bc2 100644
--- a/sys/boot/ofw/libofw/ofw_memory.c
+++ b/sys/boot/ofw/libofw/ofw_memory.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001 Benno Rice
* All rights reserved.
*
diff --git a/sys/boot/ofw/libofw/ofw_net.c b/sys/boot/ofw/libofw/ofw_net.c
index cb85eeaa41d9..456709cd7da9 100644
--- a/sys/boot/ofw/libofw/ofw_net.c
+++ b/sys/boot/ofw/libofw/ofw_net.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000-2001 Benno Rice
* All rights reserved.
*
diff --git a/sys/boot/ofw/libofw/ofw_reboot.c b/sys/boot/ofw/libofw/ofw_reboot.c
index cb1cf590825f..bbb420ac1767 100644
--- a/sys/boot/ofw/libofw/ofw_reboot.c
+++ b/sys/boot/ofw/libofw/ofw_reboot.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000 Benno Rice
* All rights reserved.
*
diff --git a/sys/boot/ofw/libofw/ofw_time.c b/sys/boot/ofw/libofw/ofw_time.c
index 581bf22320c9..f53997dc059f 100644
--- a/sys/boot/ofw/libofw/ofw_time.c
+++ b/sys/boot/ofw/libofw/ofw_time.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000 Benno Rice
* All rights reserved.
*
diff --git a/sys/boot/ofw/libofw/openfirm.c b/sys/boot/ofw/libofw/openfirm.c
index b1d2b402b487..678b2cf8e7ab 100644
--- a/sys/boot/ofw/libofw/openfirm.c
+++ b/sys/boot/ofw/libofw/openfirm.c
@@ -1,6 +1,6 @@
/* $NetBSD: Locore.c,v 1.7 2000/08/20 07:04:59 tsubai Exp $ */
-/*
+/*-
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
* Copyright (C) 1995, 1996 TooLs GmbH.
* All rights reserved.
@@ -30,7 +30,7 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/*
+/*-
* Copyright (C) 2000 Benno Rice.
* All rights reserved.
*
diff --git a/sys/boot/ofw/libofw/openfirm.h b/sys/boot/ofw/libofw/openfirm.h
index 40382cdd5022..a0e9c65ccad1 100644
--- a/sys/boot/ofw/libofw/openfirm.h
+++ b/sys/boot/ofw/libofw/openfirm.h
@@ -1,6 +1,6 @@
/* $NetBSD: openfirm.h,v 1.1 1998/05/15 10:16:00 tsubai Exp $ */
-/*
+/*-
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
* Copyright (C) 1995, 1996 TooLs GmbH.
* All rights reserved.
@@ -30,7 +30,7 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/*
+/*-
* Copyright (C) 2000 Benno Rice.
* All rights reserved.
*
diff --git a/sys/boot/sparc64/boot1/boot1.c b/sys/boot/sparc64/boot1/boot1.c
index 4c2786f755a8..813da29f4ecf 100644
--- a/sys/boot/sparc64/boot1/boot1.c
+++ b/sys/boot/sparc64/boot1/boot1.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Robert Nordier
* All rights reserved.
* Copyright (c) 2001 Robert Drehmel
diff --git a/sys/boot/sparc64/loader/locore.S b/sys/boot/sparc64/loader/locore.S
index c1b3e2bd7eb4..5eb69351815d 100644
--- a/sys/boot/sparc64/loader/locore.S
+++ b/sys/boot/sparc64/loader/locore.S
@@ -1,4 +1,4 @@
-/*
+/*-
* Initial implementation:
* Copyright (c) 2001 Robert Drehmel
* All rights reserved.
diff --git a/sys/boot/sparc64/loader/main.c b/sys/boot/sparc64/loader/main.c
index 9a8a8faa9612..c93e61038898 100644
--- a/sys/boot/sparc64/loader/main.c
+++ b/sys/boot/sparc64/loader/main.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Initial implementation:
* Copyright (c) 2001 Robert Drehmel
* All rights reserved.
diff --git a/sys/cam/cam.c b/sys/cam/cam.c
index b84132d2fcfd..9fbdac78907e 100644
--- a/sys/cam/cam.c
+++ b/sys/cam/cam.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Generic utility routines for the Common Access Method layer.
*
* Copyright (c) 1997 Justin T. Gibbs.
diff --git a/sys/cam/cam.h b/sys/cam/cam.h
index 0ca870a8ddd0..93e00b25f776 100644
--- a/sys/cam/cam.h
+++ b/sys/cam/cam.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Data structures and definitions for the CAM system.
*
* Copyright (c) 1997 Justin T. Gibbs.
diff --git a/sys/cam/cam_ccb.h b/sys/cam/cam_ccb.h
index 01995b3b8ae2..61282505a9d9 100644
--- a/sys/cam/cam_ccb.h
+++ b/sys/cam/cam_ccb.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Data structures and definitions for CAM Control Blocks (CCBs).
*
* Copyright (c) 1997, 1998 Justin T. Gibbs.
diff --git a/sys/cam/cam_debug.h b/sys/cam/cam_debug.h
index b393f7619149..8be45479b16e 100644
--- a/sys/cam/cam_debug.h
+++ b/sys/cam/cam_debug.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Macros for tracing/loging information in the CAM layer
*
* Copyright (c) 1997 Justin T. Gibbs.
diff --git a/sys/cam/cam_periph.c b/sys/cam/cam_periph.c
index 2b7622b62528..4b703f063e53 100644
--- a/sys/cam/cam_periph.c
+++ b/sys/cam/cam_periph.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Common functions for CAM "type" (peripheral) drivers.
*
* Copyright (c) 1997, 1998 Justin T. Gibbs.
diff --git a/sys/cam/cam_periph.h b/sys/cam/cam_periph.h
index 88a709d08fb5..a649142a0646 100644
--- a/sys/cam/cam_periph.h
+++ b/sys/cam/cam_periph.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Data structures and definitions for CAM peripheral ("type") drivers.
*
* Copyright (c) 1997, 1998 Justin T. Gibbs.
diff --git a/sys/cam/cam_queue.c b/sys/cam/cam_queue.c
index 0c05ee268698..6e74e9eb3581 100644
--- a/sys/cam/cam_queue.c
+++ b/sys/cam/cam_queue.c
@@ -1,4 +1,4 @@
-/*
+/*-
* CAM request queue management functions.
*
* Copyright (c) 1997 Justin T. Gibbs.
diff --git a/sys/cam/cam_queue.h b/sys/cam/cam_queue.h
index 3d0a29c6bf88..d2990ad26e94 100644
--- a/sys/cam/cam_queue.h
+++ b/sys/cam/cam_queue.h
@@ -1,4 +1,4 @@
-/*
+/*-
* CAM request queue management definitions.
*
* Copyright (c) 1997 Justin T. Gibbs.
diff --git a/sys/cam/cam_sim.c b/sys/cam/cam_sim.c
index c11e7ea4decc..28b16b686331 100644
--- a/sys/cam/cam_sim.c
+++ b/sys/cam/cam_sim.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Common functions for SCSI Interface Modules (SIMs).
*
* Copyright (c) 1997 Justin T. Gibbs.
diff --git a/sys/cam/cam_sim.h b/sys/cam/cam_sim.h
index fb6b1a4c71d1..c4e39109eabd 100644
--- a/sys/cam/cam_sim.h
+++ b/sys/cam/cam_sim.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Data structures and definitions for SCSI Interface Modules (SIMs).
*
* Copyright (c) 1997 Justin T. Gibbs.
diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c
index 19116a131907..04bd0dcfaf1f 100644
--- a/sys/cam/cam_xpt.c
+++ b/sys/cam/cam_xpt.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Implementation of the Common Access Method Transport (XPT) layer.
*
* Copyright (c) 1997, 1998, 1999 Justin T. Gibbs.
diff --git a/sys/cam/cam_xpt.h b/sys/cam/cam_xpt.h
index f23338104dc6..1b982c7cc6de 100644
--- a/sys/cam/cam_xpt.h
+++ b/sys/cam/cam_xpt.h
@@ -1,4 +1,4 @@
- /*
+/*-
* Data structures and definitions for dealing with the
* Common Access Method Transport (xpt) layer.
*
diff --git a/sys/cam/cam_xpt_periph.h b/sys/cam/cam_xpt_periph.h
index 6281a1594fbb..129c53e8de62 100644
--- a/sys/cam/cam_xpt_periph.h
+++ b/sys/cam/cam_xpt_periph.h
@@ -1,4 +1,4 @@
- /*
+/*-
* Data structures and definitions for dealing with the
* Common Access Method Transport (xpt) layer from peripheral
* drivers.
diff --git a/sys/cam/cam_xpt_sim.h b/sys/cam/cam_xpt_sim.h
index 040532060ac8..603c9efa22f8 100644
--- a/sys/cam/cam_xpt_sim.h
+++ b/sys/cam/cam_xpt_sim.h
@@ -1,4 +1,4 @@
- /*
+/*-
* Data structures and definitions for dealing with the
* Common Access Method Transport (xpt) layer.
*
diff --git a/sys/cam/scsi/scsi_all.c b/sys/cam/scsi/scsi_all.c
index 8f3a3de9aa41..e6cdc8dc605d 100644
--- a/sys/cam/scsi/scsi_all.c
+++ b/sys/cam/scsi/scsi_all.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Implementation of Utility functions for all SCSI device types.
*
* Copyright (c) 1997, 1998, 1999 Justin T. Gibbs.
diff --git a/sys/cam/scsi/scsi_all.h b/sys/cam/scsi/scsi_all.h
index 9470ee847602..02cfd186a649 100644
--- a/sys/cam/scsi/scsi_all.h
+++ b/sys/cam/scsi/scsi_all.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Largely written by Julian Elischer (julian@tfs.com)
* for TRW Financial Systems.
*
diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c
index f587b00a703c..012e3a27a5b2 100644
--- a/sys/cam/scsi/scsi_cd.c
+++ b/sys/cam/scsi/scsi_cd.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997 Justin T. Gibbs.
* Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Kenneth D. Merry.
* All rights reserved.
@@ -25,7 +25,7 @@
* SUCH DAMAGE.
*/
-/*
+/*-
* Portions of this driver taken from the original FreeBSD cd driver.
* Written by Julian Elischer (julian@tfs.com)
* for TRW Financial Systems for use under the MACH(2.5) operating system.
diff --git a/sys/cam/scsi/scsi_ch.c b/sys/cam/scsi/scsi_ch.c
index 1cf3b1fb5c72..b7941b971886 100644
--- a/sys/cam/scsi/scsi_ch.c
+++ b/sys/cam/scsi/scsi_ch.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997 Justin T. Gibbs.
* Copyright (c) 1997, 1998, 1999 Kenneth D. Merry.
* All rights reserved.
@@ -31,7 +31,7 @@
* $NetBSD: ch.c,v 1.32 1998/01/12 09:49:12 thorpej Exp $
*
*/
-/*
+/*-
* Copyright (c) 1996, 1997 Jason R. Thorpe <thorpej@and.com>
* All rights reserved.
*
diff --git a/sys/cam/scsi/scsi_ch.h b/sys/cam/scsi/scsi_ch.h
index 754777918453..8490e567fc8a 100644
--- a/sys/cam/scsi/scsi_ch.h
+++ b/sys/cam/scsi/scsi_ch.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* $NetBSD: scsi_changer.h,v 1.11 1998/02/13 08:28:32 enami Exp $ */
-/*
+/*-
* Copyright (c) 1996 Jason R. Thorpe <thorpej@and.com>
* All rights reserved.
*
@@ -41,7 +41,7 @@
* SCSI changer interface description
*/
-/*
+/*-
* Partially derived from software written by Stefan Grefen
* (grefen@goofy.zdv.uni-mainz.de soon grefen@convex.com)
* based on the SCSI System by written Julian Elischer (julian@tfs.com)
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index 4570ed23b2fa..505fd8a8bec3 100644
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Implementation of SCSI Direct Access Peripheral driver for CAM.
*
* Copyright (c) 1997 Justin T. Gibbs.
diff --git a/sys/cam/scsi/scsi_da.h b/sys/cam/scsi/scsi_da.h
index 994eb0313488..4e314b8eca33 100644
--- a/sys/cam/scsi/scsi_da.h
+++ b/sys/cam/scsi/scsi_da.h
@@ -2,7 +2,7 @@
* Structures and definitions for SCSI commands to Direct Access Devices
*/
-/*
+/*-
* Some lines of this file come from a file of the name "scsi.h"
* distributed by OSF as part of mach2.5,
* so the following disclaimer has been kept.
@@ -30,7 +30,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/*
+/*-
* Largely written by Julian Elischer (julian@tfs.com)
* for TRW Financial Systems.
*
diff --git a/sys/cam/scsi/scsi_dvcfg.h b/sys/cam/scsi/scsi_dvcfg.h
index b963e5d77721..229dec782149 100644
--- a/sys/cam/scsi/scsi_dvcfg.h
+++ b/sys/cam/scsi/scsi_dvcfg.h
@@ -2,7 +2,7 @@
/* $NecBSD: scsi_dvcfg.h,v 1.4 1998/03/14 07:05:06 kmatsuda Exp $ */
/* $NetBSD$ */
-/*
+/*-
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1994, 1995, 1996, 1997, 1998
* NetBSD/pc98 porting staff. All rights reserved.
diff --git a/sys/cam/scsi/scsi_iu.h b/sys/cam/scsi/scsi_iu.h
index d5cae8159fed..7e577715d550 100644
--- a/sys/cam/scsi/scsi_iu.h
+++ b/sys/cam/scsi/scsi_iu.h
@@ -1,4 +1,4 @@
-/*
+/*-
* This file is in the public domain.
* $FreeBSD$
*/
diff --git a/sys/cam/scsi/scsi_low.c b/sys/cam/scsi/scsi_low.c
index 0d9b3b4dc8b6..724341b706dd 100644
--- a/sys/cam/scsi/scsi_low.c
+++ b/sys/cam/scsi/scsi_low.c
@@ -22,7 +22,7 @@ __FBSDID("$FreeBSD$");
#define SCSI_LOW_FLAGS_QUIRKS_OK
#endif /* __FreeBSD__ */
-/*
+/*-
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1995, 1996, 1997, 1998, 1999, 2000, 2001
* NetBSD/pc98 porting staff. All rights reserved.
diff --git a/sys/cam/scsi/scsi_low.h b/sys/cam/scsi/scsi_low.h
index 272400147148..4dfa6021533d 100644
--- a/sys/cam/scsi/scsi_low.h
+++ b/sys/cam/scsi/scsi_low.h
@@ -5,7 +5,7 @@
#define SCSI_LOW_DIAGNOSTIC
#define SCSI_LOW_ALT_QTAG_ALLOCATE
-/*
+/*-
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1995, 1996, 1997, 1998, 1999, 2000, 2001
* NetBSD/pc98 porting staff. All rights reserved.
diff --git a/sys/cam/scsi/scsi_low_pisa.c b/sys/cam/scsi/scsi_low_pisa.c
index 43a8d8475eb1..13020bb05313 100644
--- a/sys/cam/scsi/scsi_low_pisa.c
+++ b/sys/cam/scsi/scsi_low_pisa.c
@@ -1,6 +1,6 @@
/* $NecBSD: scsi_low_pisa.c,v 1.13.18.1 2001/06/08 06:27:48 honda Exp $ */
/* $NetBSD$ */
-/*
+/*-
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1995, 1996, 1997, 1998
* NetBSD/pc98 porting staff. All rights reserved.
diff --git a/sys/cam/scsi/scsi_low_pisa.h b/sys/cam/scsi/scsi_low_pisa.h
index 1e0916ca57a8..e0f1c7467326 100644
--- a/sys/cam/scsi/scsi_low_pisa.h
+++ b/sys/cam/scsi/scsi_low_pisa.h
@@ -2,7 +2,7 @@
/* $NecBSD: scsi_low_pisa.h,v 1.3.14.1 2001/06/08 06:27:49 honda Exp $ */
/* $NetBSD$ */
-/*
+/*-
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1998
* NetBSD/pc98 porting staff. All rights reserved.
diff --git a/sys/cam/scsi/scsi_message.h b/sys/cam/scsi/scsi_message.h
index 85dc4cb21363..53b7640ade4d 100644
--- a/sys/cam/scsi/scsi_message.h
+++ b/sys/cam/scsi/scsi_message.h
@@ -1,4 +1,4 @@
-/*
+/*-
* This file is in the public domain.
* $FreeBSD$
*/
diff --git a/sys/cam/scsi/scsi_pass.c b/sys/cam/scsi/scsi_pass.c
index ec98f42591ac..a25a9d8a404b 100644
--- a/sys/cam/scsi/scsi_pass.c
+++ b/sys/cam/scsi/scsi_pass.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, 1998, 2000 Justin T. Gibbs.
* Copyright (c) 1997, 1998, 1999 Kenneth D. Merry.
* All rights reserved.
diff --git a/sys/cam/scsi/scsi_pass.h b/sys/cam/scsi/scsi_pass.h
index d39765977ff3..ae0e0586b2f4 100644
--- a/sys/cam/scsi/scsi_pass.h
+++ b/sys/cam/scsi/scsi_pass.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, 1999 Kenneth D. Merry.
* All rights reserved.
*
diff --git a/sys/cam/scsi/scsi_pt.c b/sys/cam/scsi/scsi_pt.c
index 94653b524c96..412155a66ba1 100644
--- a/sys/cam/scsi/scsi_pt.c
+++ b/sys/cam/scsi/scsi_pt.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Implementation of SCSI Processor Target Peripheral driver for CAM.
*
* Copyright (c) 1998 Justin T. Gibbs.
diff --git a/sys/cam/scsi/scsi_pt.h b/sys/cam/scsi/scsi_pt.h
index 6e2b30d53204..0f96b5b58408 100644
--- a/sys/cam/scsi/scsi_pt.h
+++ b/sys/cam/scsi/scsi_pt.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Structure and function declarations for Processor type devices.
*
* Copyright (c) 1998 Justin T. Gibbs
diff --git a/sys/cam/scsi/scsi_sa.c b/sys/cam/scsi/scsi_sa.c
index 4836b8ade116..8a364096b994 100644
--- a/sys/cam/scsi/scsi_sa.c
+++ b/sys/cam/scsi/scsi_sa.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Implementation of SCSI Sequential Access Peripheral driver for CAM.
*
* Copyright (c) 1999, 2000 Matthew Jacob
diff --git a/sys/cam/scsi/scsi_sa.h b/sys/cam/scsi/scsi_sa.h
index 92a150226dd9..b1cee795ac59 100644
--- a/sys/cam/scsi/scsi_sa.h
+++ b/sys/cam/scsi/scsi_sa.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Structure and function declarations for the
* SCSI Sequential Access Peripheral driver for CAM.
*
diff --git a/sys/cam/scsi/scsi_ses.c b/sys/cam/scsi/scsi_ses.c
index 25b94892ae16..0c8c2a924c98 100644
--- a/sys/cam/scsi/scsi_ses.c
+++ b/sys/cam/scsi/scsi_ses.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000 Matthew Jacob
* All rights reserved.
*
diff --git a/sys/cam/scsi/scsi_ses.h b/sys/cam/scsi/scsi_ses.h
index 1849019af226..9574e7c916a1 100644
--- a/sys/cam/scsi/scsi_ses.h
+++ b/sys/cam/scsi/scsi_ses.h
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 2000 by Matthew Jacob
* All rights reserved.
*
diff --git a/sys/cam/scsi/scsi_targ_bh.c b/sys/cam/scsi/scsi_targ_bh.c
index 9f5fc1bc009e..828cbbb7c249 100644
--- a/sys/cam/scsi/scsi_targ_bh.c
+++ b/sys/cam/scsi/scsi_targ_bh.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Implementation of the Target Mode 'Black Hole device' for CAM.
*
* Copyright (c) 1999 Justin T. Gibbs.
diff --git a/sys/cam/scsi/scsi_target.c b/sys/cam/scsi/scsi_target.c
index a3e3381d160e..a3726d63653c 100644
--- a/sys/cam/scsi/scsi_target.c
+++ b/sys/cam/scsi/scsi_target.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Generic SCSI Target Kernel Mode Driver
*
* Copyright (c) 2002 Nate Lawson.
diff --git a/sys/cam/scsi/scsi_targetio.h b/sys/cam/scsi/scsi_targetio.h
index b6f57dbed809..0c868067c5f6 100644
--- a/sys/cam/scsi/scsi_targetio.h
+++ b/sys/cam/scsi/scsi_targetio.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Ioctl definitions for the SCSI Target Driver
*
* Copyright (c) 2002 Nate Lawson.
diff --git a/sys/coda/cnode.h b/sys/coda/cnode.h
index be7e848bbea6..02214d2097ad 100644
--- a/sys/coda/cnode.h
+++ b/sys/coda/cnode.h
@@ -1,4 +1,4 @@
-/*
+/*-
*
* Coda: an Experimental Distributed File System
* Release 3.1
@@ -31,7 +31,7 @@
*
*/
-/*
+/*-
* Mach Operating System
* Copyright (c) 1990 Carnegie-Mellon University
* Copyright (c) 1989 Carnegie-Mellon University
diff --git a/sys/coda/coda.h b/sys/coda/coda.h
index 5fb352effb82..bd87a9e2836a 100644
--- a/sys/coda/coda.h
+++ b/sys/coda/coda.h
@@ -1,4 +1,4 @@
-/*
+/*-
*
* Coda: an Experimental Distributed File System
* Release 3.1
diff --git a/sys/coda/coda_fbsd.c b/sys/coda/coda_fbsd.c
index d3feff0b2b91..ddb6a943ee2b 100644
--- a/sys/coda/coda_fbsd.c
+++ b/sys/coda/coda_fbsd.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Coda: an Experimental Distributed File System
* Release 3.1
*
diff --git a/sys/coda/coda_io.h b/sys/coda/coda_io.h
index 4daede1e4c13..1985b01a5c56 100644
--- a/sys/coda/coda_io.h
+++ b/sys/coda/coda_io.h
@@ -1,4 +1,4 @@
-/*
+/*-
*
* Coda: an Experimental Distributed File System
* Release 3.1
@@ -31,7 +31,7 @@
*
*/
-/*
+/*-
* Mach Operating System
* Copyright (c) 1990 Carnegie-Mellon University
* Copyright (c) 1989 Carnegie-Mellon University
diff --git a/sys/coda/coda_kernel.h b/sys/coda/coda_kernel.h
index cc0fd957f81c..fd365b8ad37d 100644
--- a/sys/coda/coda_kernel.h
+++ b/sys/coda/coda_kernel.h
@@ -1,4 +1,4 @@
-/*
+/*-
*
* Coda: an Experimental Distributed File System
* Release 3.1
diff --git a/sys/coda/coda_namecache.c b/sys/coda/coda_namecache.c
index 5f8106a9c7ae..f8a79f5a87d1 100644
--- a/sys/coda/coda_namecache.c
+++ b/sys/coda/coda_namecache.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Coda: an Experimental Distributed File System
* Release 3.1
*
@@ -27,7 +27,7 @@
*
* @(#) src/sys/coda/coda_namecache.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
*/
-/*
+/*-
* Mach Operating System
* Copyright (c) 1990 Carnegie-Mellon University
* Copyright (c) 1989 Carnegie-Mellon University
diff --git a/sys/coda/coda_namecache.h b/sys/coda/coda_namecache.h
index 13bb99dad18a..77f2cb168255 100644
--- a/sys/coda/coda_namecache.h
+++ b/sys/coda/coda_namecache.h
@@ -1,4 +1,4 @@
-/*
+/*-
*
* Coda: an Experimental Distributed File System
* Release 3.1
@@ -31,7 +31,7 @@
*
*/
-/*
+/*-
* Mach Operating System
* Copyright (c) 1990 Carnegie-Mellon University
* Copyright (c) 1989 Carnegie-Mellon University
diff --git a/sys/coda/coda_opstats.h b/sys/coda/coda_opstats.h
index 8661a07ebfa0..a8d52b3a8456 100644
--- a/sys/coda/coda_opstats.h
+++ b/sys/coda/coda_opstats.h
@@ -1,4 +1,4 @@
-/*
+/*-
*
* Coda: an Experimental Distributed File System
* Release 3.1
diff --git a/sys/coda/coda_pioctl.h b/sys/coda/coda_pioctl.h
index a76c653e9f7b..ea61b6429a4e 100644
--- a/sys/coda/coda_pioctl.h
+++ b/sys/coda/coda_pioctl.h
@@ -1,4 +1,4 @@
-/*
+/*-
*
* Coda: an Experimental Distributed File System
* Release 3.1
@@ -31,7 +31,7 @@
*
*/
-/*
+/*-
* Mach Operating System
* Copyright (c) 1989 Carnegie-Mellon University
* Copyright (c) 1988 Carnegie-Mellon University
diff --git a/sys/coda/coda_psdev.c b/sys/coda/coda_psdev.c
index 03e408da63d6..37210c2b0ba4 100644
--- a/sys/coda/coda_psdev.c
+++ b/sys/coda/coda_psdev.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Coda: an Experimental Distributed File System
* Release 3.1
*
@@ -27,7 +27,7 @@
*
* @(#) src/sys/coda/coda_psdev.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
*/
-/*
+/*-
* Mach Operating System
* Copyright (c) 1989 Carnegie-Mellon University
* All rights reserved. The CMU software License Agreement specifies
diff --git a/sys/coda/coda_psdev.h b/sys/coda/coda_psdev.h
index f135b3441208..5d1193ba0447 100644
--- a/sys/coda/coda_psdev.h
+++ b/sys/coda/coda_psdev.h
@@ -1,4 +1,4 @@
-/*
+/*-
*
* Coda: an Experimental Distributed File System
* Release 3.1
diff --git a/sys/coda/coda_subr.c b/sys/coda/coda_subr.c
index a59425f2e80b..99eb883e66d0 100644
--- a/sys/coda/coda_subr.c
+++ b/sys/coda/coda_subr.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Coda: an Experimental Distributed File System
* Release 3.1
*
@@ -27,7 +27,7 @@
*
* @(#) src/sys/coda/coda_subr.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
*/
-/*
+/*-
* Mach Operating System
* Copyright (c) 1989 Carnegie-Mellon University
* All rights reserved. The CMU software License Agreement specifies
diff --git a/sys/coda/coda_subr.h b/sys/coda/coda_subr.h
index 2b026eb674a3..91bf1228e6ce 100644
--- a/sys/coda/coda_subr.h
+++ b/sys/coda/coda_subr.h
@@ -1,4 +1,4 @@
-/*
+/*-
*
* Coda: an Experimental Distributed File System
* Release 3.1
diff --git a/sys/coda/coda_venus.c b/sys/coda/coda_venus.c
index 7e4d32109045..a222e7deaead 100644
--- a/sys/coda/coda_venus.c
+++ b/sys/coda/coda_venus.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Coda: an Experimental Distributed File System
* Release 3.1
*
diff --git a/sys/coda/coda_venus.h b/sys/coda/coda_venus.h
index 473b84d30092..533ddcbf2b3e 100644
--- a/sys/coda/coda_venus.h
+++ b/sys/coda/coda_venus.h
@@ -1,4 +1,4 @@
-/*
+/*-
*
* Coda: an Experimental Distributed File System
* Release 3.1
diff --git a/sys/coda/coda_vfsops.c b/sys/coda/coda_vfsops.c
index 189ee92487fc..345d01c760a8 100644
--- a/sys/coda/coda_vfsops.c
+++ b/sys/coda/coda_vfsops.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Coda: an Experimental Distributed File System
* Release 3.1
*
@@ -27,7 +27,7 @@
*
* @(#) src/sys/cfs/coda_vfsops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
*/
-/*
+/*-
* Mach Operating System
* Copyright (c) 1989 Carnegie-Mellon University
* All rights reserved. The CMU software License Agreement specifies
diff --git a/sys/coda/coda_vfsops.h b/sys/coda/coda_vfsops.h
index 6d36232c1be2..53b55d40b2f0 100644
--- a/sys/coda/coda_vfsops.h
+++ b/sys/coda/coda_vfsops.h
@@ -1,4 +1,4 @@
-/*
+/*-
*
* Coda: an Experimental Distributed File System
* Release 3.1
diff --git a/sys/coda/coda_vnops.c b/sys/coda/coda_vnops.c
index 97621a8c4c7b..d4bb1722ac25 100644
--- a/sys/coda/coda_vnops.c
+++ b/sys/coda/coda_vnops.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Coda: an Experimental Distributed File System
* Release 3.1
*
diff --git a/sys/coda/coda_vnops.h b/sys/coda/coda_vnops.h
index 88a398e8cd6c..8f610543968a 100644
--- a/sys/coda/coda_vnops.h
+++ b/sys/coda/coda_vnops.h
@@ -1,4 +1,4 @@
-/*
+/*-
*
* Coda: an Experimental Distributed File System
* Release 3.1
diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c
index 3ec73adf6577..58c2d2634124 100644
--- a/sys/compat/linprocfs/linprocfs.c
+++ b/sys/compat/linprocfs/linprocfs.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000 Dag-Erling Coïdan Smørgrav
* Copyright (c) 1999 Pierre Beyssac
* Copyright (c) 1993 Jan-Simon Pendry
diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c
index 677d8ffccdbc..cf5e27fa9743 100644
--- a/sys/compat/linux/linux_ioctl.c
+++ b/sys/compat/linux/linux_ioctl.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1994-1995 Søren Schmidt
* All rights reserved.
*
diff --git a/sys/compat/linux/linux_ioctl.h b/sys/compat/linux/linux_ioctl.h
index 4d20ab906a53..96243dd89a76 100644
--- a/sys/compat/linux/linux_ioctl.h
+++ b/sys/compat/linux/linux_ioctl.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/compat/linux/linux_util.c b/sys/compat/linux/linux_util.c
index 264e6c109324..9276cb92a27a 100644
--- a/sys/compat/linux/linux_util.c
+++ b/sys/compat/linux/linux_util.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1994 Christos Zoulas
* Copyright (c) 1995 Frank van der Linden
* Copyright (c) 1995 Scott Bartram
diff --git a/sys/compat/linux/linux_util.h b/sys/compat/linux/linux_util.h
index 48014537712b..88b831c658be 100644
--- a/sys/compat/linux/linux_util.h
+++ b/sys/compat/linux/linux_util.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1994 Christos Zoulas
* Copyright (c) 1995 Frank van der Linden
* Copyright (c) 1995 Scott Bartram
diff --git a/sys/compat/ndis/cfg_var.h b/sys/compat/ndis/cfg_var.h
index 11991091613e..1fb44ce268a1 100644
--- a/sys/compat/ndis/cfg_var.h
+++ b/sys/compat/ndis/cfg_var.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/compat/ndis/subr_pe.c b/sys/compat/ndis/subr_pe.c
index b1480cfaafc9..5f37eade203b 100644
--- a/sys/compat/ndis/subr_pe.c
+++ b/sys/compat/ndis/subr_pe.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/compat/netbsd/dvcfg.h b/sys/compat/netbsd/dvcfg.h
index 585d3c510626..817ab3d707b3 100644
--- a/sys/compat/netbsd/dvcfg.h
+++ b/sys/compat/netbsd/dvcfg.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
/* $NetBSD$ */
-/*
+/*-
* [NetBSD for NEC PC98 series]
* Copyright (c) 1996 NetBSD/pc98 porting staff.
* All rights reserved.
diff --git a/sys/compat/netbsd/physio_proc.h b/sys/compat/netbsd/physio_proc.h
index bffe9f3606ec..fde967367d29 100644
--- a/sys/compat/netbsd/physio_proc.h
+++ b/sys/compat/netbsd/physio_proc.h
@@ -2,7 +2,7 @@
/* $NecBSD: physio_proc.h,v 3.4 1999/07/23 20:47:03 honda Exp $ */
/* $NetBSD$ */
-/*
+/*-
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1998
* NetBSD/pc98 porting staff. All rights reserved.
diff --git a/sys/compat/pecoff/imgact_pecoff.c b/sys/compat/pecoff/imgact_pecoff.c
index 6a91b1387051..355204e96546 100644
--- a/sys/compat/pecoff/imgact_pecoff.c
+++ b/sys/compat/pecoff/imgact_pecoff.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000 Masaru OKI
* Copyright (c) 1994, 1995, 1998 Scott Bartram
* Copyright (c) 1994 Adam Glass
diff --git a/sys/compat/pecoff/imgact_pecoff.h b/sys/compat/pecoff/imgact_pecoff.h
index 0da3a5604e30..a625a9b8e9f8 100644
--- a/sys/compat/pecoff/imgact_pecoff.h
+++ b/sys/compat/pecoff/imgact_pecoff.h
@@ -1,6 +1,6 @@
/* $NetBSD$ */
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 2000 Masaru OKI
*/
diff --git a/sys/compat/svr4/svr4.h b/sys/compat/svr4/svr4.h
index 66408640e003..352858dfccc4 100644
--- a/sys/compat/svr4/svr4.h
+++ b/sys/compat/svr4/svr4.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* All rights reserved.
*
diff --git a/sys/compat/svr4/svr4_acl.h b/sys/compat/svr4/svr4_acl.h
index 6d9454f65ecd..ef2da1a68a6a 100644
--- a/sys/compat/svr4/svr4_acl.h
+++ b/sys/compat/svr4/svr4_acl.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1996 Christos Zoulas.
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_dirent.h b/sys/compat/svr4/svr4_dirent.h
index 244078227888..9ce7bf88e0e8 100644
--- a/sys/compat/svr4/svr4_dirent.h
+++ b/sys/compat/svr4/svr4_dirent.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_errno.h b/sys/compat/svr4/svr4_errno.h
index cc39929acfd5..b5fa2743365e 100644
--- a/sys/compat/svr4/svr4_errno.h
+++ b/sys/compat/svr4/svr4_errno.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_exec.h b/sys/compat/svr4/svr4_exec.h
index 672a3602e0e9..adab956ac84c 100644
--- a/sys/compat/svr4/svr4_exec.h
+++ b/sys/compat/svr4/svr4_exec.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_fcntl.c b/sys/compat/svr4/svr4_fcntl.c
index 0c592c30b48a..c3db53b78b48 100644
--- a/sys/compat/svr4/svr4_fcntl.c
+++ b/sys/compat/svr4/svr4_fcntl.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1994, 1997 Christos Zoulas.
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_fcntl.h b/sys/compat/svr4/svr4_fcntl.h
index 3309a4f21cd1..1a354a799457 100644
--- a/sys/compat/svr4/svr4_fcntl.h
+++ b/sys/compat/svr4/svr4_fcntl.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_filio.c b/sys/compat/svr4/svr4_filio.c
index c15c5b493cb9..6867126c3d80 100644
--- a/sys/compat/svr4/svr4_filio.c
+++ b/sys/compat/svr4/svr4_filio.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_filio.h b/sys/compat/svr4/svr4_filio.h
index 37184cb72610..baf81c7e228e 100644
--- a/sys/compat/svr4/svr4_filio.h
+++ b/sys/compat/svr4/svr4_filio.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_fuser.h b/sys/compat/svr4/svr4_fuser.h
index f828c843c2b4..df2db984bb58 100644
--- a/sys/compat/svr4/svr4_fuser.h
+++ b/sys/compat/svr4/svr4_fuser.h
@@ -41,7 +41,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-/*
+/*-
* Portions of this code have been derived from code contributed to the
* FreeBSD Project by Mark Newton.
*
diff --git a/sys/compat/svr4/svr4_hrt.h b/sys/compat/svr4/svr4_hrt.h
index c160b8eeb6e9..5a3bb6729394 100644
--- a/sys/compat/svr4/svr4_hrt.h
+++ b/sys/compat/svr4/svr4_hrt.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_ioctl.c b/sys/compat/svr4/svr4_ioctl.c
index 61f9d75b9143..b192a2c77ec8 100644
--- a/sys/compat/svr4/svr4_ioctl.c
+++ b/sys/compat/svr4/svr4_ioctl.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_ioctl.h b/sys/compat/svr4/svr4_ioctl.h
index 54811b9ee138..e0633a7e4e1f 100644
--- a/sys/compat/svr4/svr4_ioctl.h
+++ b/sys/compat/svr4/svr4_ioctl.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_ipc.c b/sys/compat/svr4/svr4_ipc.c
index ff148b33b9ba..4372eb00c800 100644
--- a/sys/compat/svr4/svr4_ipc.c
+++ b/sys/compat/svr4/svr4_ipc.c
@@ -33,7 +33,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
-/*
+/*-
* Portions of this code have been derived from software contributed
* to the FreeBSD Project by Mark Newton.
*
diff --git a/sys/compat/svr4/svr4_ipc.h b/sys/compat/svr4/svr4_ipc.h
index 6aadb7e050ec..36cf3ddceb3e 100644
--- a/sys/compat/svr4/svr4_ipc.h
+++ b/sys/compat/svr4/svr4_ipc.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1995 Christos Zoulas. All rights reserved.
*
diff --git a/sys/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c
index 243dc226aa30..ab72156c8d00 100644
--- a/sys/compat/svr4/svr4_misc.c
+++ b/sys/compat/svr4/svr4_misc.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_mman.h b/sys/compat/svr4/svr4_mman.h
index db7c3dacef5f..e30e4924661c 100644
--- a/sys/compat/svr4/svr4_mman.h
+++ b/sys/compat/svr4/svr4_mman.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1997 Todd Vierling
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_resource.c b/sys/compat/svr4/svr4_resource.c
index 6aed48d413e3..7b57c3f745c3 100644
--- a/sys/compat/svr4/svr4_resource.c
+++ b/sys/compat/svr4/svr4_resource.c
@@ -33,7 +33,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
-/*
+/*-
* Portions of this software have been derived from software contributed
* to the FreeBSD Project by Mark Newton.
*
@@ -76,6 +76,7 @@ __FBSDID("$FreeBSD$");
#include <sys/proc.h>
#include <sys/resource.h>
#include <sys/resourcevar.h>
+#include <sys/syscallsubr.h>
#include <compat/svr4/svr4.h>
#include <compat/svr4/svr4_types.h>
diff --git a/sys/compat/svr4/svr4_resource.h b/sys/compat/svr4/svr4_resource.h
index 3512df387674..4b93e9a229dc 100644
--- a/sys/compat/svr4/svr4_resource.h
+++ b/sys/compat/svr4/svr4_resource.h
@@ -41,7 +41,7 @@
* $FreeBSD$
*/
-/*
+/*-
* Portions of this code derived from software contributed to the
* FreeBSD Project by Mark Newton.
*
diff --git a/sys/compat/svr4/svr4_siginfo.h b/sys/compat/svr4/svr4_siginfo.h
index be898374dc2b..4f2eaf4e1961 100644
--- a/sys/compat/svr4/svr4_siginfo.h
+++ b/sys/compat/svr4/svr4_siginfo.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_signal.c b/sys/compat/svr4/svr4_signal.c
index dc6af50f3924..1a3f7f1c9c6a 100644
--- a/sys/compat/svr4/svr4_signal.c
+++ b/sys/compat/svr4/svr4_signal.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_signal.h b/sys/compat/svr4/svr4_signal.h
index 5a01a8fb24e1..dbb42ba0eb7e 100644
--- a/sys/compat/svr4/svr4_signal.h
+++ b/sys/compat/svr4/svr4_signal.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_socket.c b/sys/compat/svr4/svr4_socket.c
index 65126d76cdf6..ffa014bc56f8 100644
--- a/sys/compat/svr4/svr4_socket.c
+++ b/sys/compat/svr4/svr4_socket.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1996 Christos Zoulas.
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_socket.h b/sys/compat/svr4/svr4_socket.h
index 1df1e43d7685..26d20f0ae548 100644
--- a/sys/compat/svr4/svr4_socket.h
+++ b/sys/compat/svr4/svr4_socket.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1996 Christos Zoulas.
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_sockio.c b/sys/compat/svr4/svr4_sockio.c
index 089daff81f2c..9eee1567ed6d 100644
--- a/sys/compat/svr4/svr4_sockio.c
+++ b/sys/compat/svr4/svr4_sockio.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1995 Christos Zoulas
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_sockio.h b/sys/compat/svr4/svr4_sockio.h
index dd4e220c9f48..6160aa3daac5 100644
--- a/sys/compat/svr4/svr4_sockio.h
+++ b/sys/compat/svr4/svr4_sockio.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1995 Christos Zoulas
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_sockmod.h b/sys/compat/svr4/svr4_sockmod.h
index 927ba0d28367..622ff6f8b803 100644
--- a/sys/compat/svr4/svr4_sockmod.h
+++ b/sys/compat/svr4/svr4_sockmod.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_stat.c b/sys/compat/svr4/svr4_stat.c
index a361bd2f1ec0..b5e0a1c720f8 100644
--- a/sys/compat/svr4/svr4_stat.c
+++ b/sys/compat/svr4/svr4_stat.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_stat.h b/sys/compat/svr4/svr4_stat.h
index e92aea68f367..03d6e3c6ed36 100644
--- a/sys/compat/svr4/svr4_stat.h
+++ b/sys/compat/svr4/svr4_stat.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_statvfs.h b/sys/compat/svr4/svr4_statvfs.h
index b3bf473a1b52..7db9655e5aa2 100644
--- a/sys/compat/svr4/svr4_statvfs.h
+++ b/sys/compat/svr4/svr4_statvfs.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_stream.c b/sys/compat/svr4/svr4_stream.c
index 0e708f6ee991..2ad2399ef3e2 100644
--- a/sys/compat/svr4/svr4_stream.c
+++ b/sys/compat/svr4/svr4_stream.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton. All rights reserved.
* Copyright (c) 1994, 1996 Christos Zoulas. All rights reserved.
*
diff --git a/sys/compat/svr4/svr4_stropts.h b/sys/compat/svr4/svr4_stropts.h
index e5a39e9ab779..c7847a63b728 100644
--- a/sys/compat/svr4/svr4_stropts.h
+++ b/sys/compat/svr4/svr4_stropts.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_sysconfig.h b/sys/compat/svr4/svr4_sysconfig.h
index 874c5653e634..b88fe19fac18 100644
--- a/sys/compat/svr4/svr4_sysconfig.h
+++ b/sys/compat/svr4/svr4_sysconfig.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1995 Christos Zoulas
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_systeminfo.h b/sys/compat/svr4/svr4_systeminfo.h
index 40bc2b85d757..2d5288e0bf42 100644
--- a/sys/compat/svr4/svr4_systeminfo.h
+++ b/sys/compat/svr4/svr4_systeminfo.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_sysvec.c b/sys/compat/svr4/svr4_sysvec.c
index 64639f2e1110..496901ae562d 100644
--- a/sys/compat/svr4/svr4_sysvec.c
+++ b/sys/compat/svr4/svr4_sysvec.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* All rights reserved.
*
diff --git a/sys/compat/svr4/svr4_termios.c b/sys/compat/svr4/svr4_termios.c
index a6cb59fdae97..37a6783aff11 100644
--- a/sys/compat/svr4/svr4_termios.c
+++ b/sys/compat/svr4/svr4_termios.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_termios.h b/sys/compat/svr4/svr4_termios.h
index 8afa4f321bc3..c2b0c543e2a7 100644
--- a/sys/compat/svr4/svr4_termios.h
+++ b/sys/compat/svr4/svr4_termios.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_time.h b/sys/compat/svr4/svr4_time.h
index 3d61771fc904..0be98235dc77 100644
--- a/sys/compat/svr4/svr4_time.h
+++ b/sys/compat/svr4/svr4_time.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_timod.h b/sys/compat/svr4/svr4_timod.h
index f0c508f511b8..e295a4cc4e41 100644
--- a/sys/compat/svr4/svr4_timod.h
+++ b/sys/compat/svr4/svr4_timod.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_ttold.c b/sys/compat/svr4/svr4_ttold.c
index 3b4b841a789d..3575607faa95 100644
--- a/sys/compat/svr4/svr4_ttold.c
+++ b/sys/compat/svr4/svr4_ttold.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_ttold.h b/sys/compat/svr4/svr4_ttold.h
index c578170a1ef9..aecde201c923 100644
--- a/sys/compat/svr4/svr4_ttold.h
+++ b/sys/compat/svr4/svr4_ttold.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_types.h b/sys/compat/svr4/svr4_types.h
index 410746b6adc9..af801d874322 100644
--- a/sys/compat/svr4/svr4_types.h
+++ b/sys/compat/svr4/svr4_types.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_ucontext.h b/sys/compat/svr4/svr4_ucontext.h
index 04bebe6eb81e..24cb5a12793e 100644
--- a/sys/compat/svr4/svr4_ucontext.h
+++ b/sys/compat/svr4/svr4_ucontext.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_ulimit.h b/sys/compat/svr4/svr4_ulimit.h
index 0735d42f722f..d636c01d4608 100644
--- a/sys/compat/svr4/svr4_ulimit.h
+++ b/sys/compat/svr4/svr4_ulimit.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_ustat.h b/sys/compat/svr4/svr4_ustat.h
index e9ebffbfdaae..3b9ade126fcd 100644
--- a/sys/compat/svr4/svr4_ustat.h
+++ b/sys/compat/svr4/svr4_ustat.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_util.h b/sys/compat/svr4/svr4_util.h
index e0cb54ff3cf1..dc122376f4df 100644
--- a/sys/compat/svr4/svr4_util.h
+++ b/sys/compat/svr4/svr4_util.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_utsname.h b/sys/compat/svr4/svr4_utsname.h
index 0ff6deadc7d1..71795755129f 100644
--- a/sys/compat/svr4/svr4_utsname.h
+++ b/sys/compat/svr4/svr4_utsname.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
diff --git a/sys/compat/svr4/svr4_wait.h b/sys/compat/svr4/svr4_wait.h
index 9a92c0114c1c..0ce5db74c007 100644
--- a/sys/compat/svr4/svr4_wait.h
+++ b/sys/compat/svr4/svr4_wait.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
diff --git a/sys/ddb/db_access.c b/sys/ddb/db_access.c
index d8224ada5a52..2d17504070c6 100644
--- a/sys/ddb/db_access.c
+++ b/sys/ddb/db_access.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* All Rights Reserved.
diff --git a/sys/ddb/db_access.h b/sys/ddb/db_access.h
index 9709c3141f67..44915e316d15 100644
--- a/sys/ddb/db_access.h
+++ b/sys/ddb/db_access.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* All Rights Reserved.
diff --git a/sys/ddb/db_break.c b/sys/ddb/db_break.c
index 78f4f4f3039e..ac0c87418487 100644
--- a/sys/ddb/db_break.c
+++ b/sys/ddb/db_break.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* All Rights Reserved.
diff --git a/sys/ddb/db_break.h b/sys/ddb/db_break.h
index d6ed76e6a821..f30b9337c26c 100644
--- a/sys/ddb/db_break.h
+++ b/sys/ddb/db_break.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* All Rights Reserved.
diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c
index 2e45a3d2ae66..904b6a61f0a2 100644
--- a/sys/ddb/db_command.c
+++ b/sys/ddb/db_command.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* All Rights Reserved.
diff --git a/sys/ddb/db_command.h b/sys/ddb/db_command.h
index bc5fe6cbe42a..1825b0e3c6fc 100644
--- a/sys/ddb/db_command.h
+++ b/sys/ddb/db_command.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* All Rights Reserved.
diff --git a/sys/ddb/db_examine.c b/sys/ddb/db_examine.c
index aa89022cfb43..9be98e46048c 100644
--- a/sys/ddb/db_examine.c
+++ b/sys/ddb/db_examine.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* All Rights Reserved.
diff --git a/sys/ddb/db_expr.c b/sys/ddb/db_expr.c
index 3495a58117c0..0bf6c836e329 100644
--- a/sys/ddb/db_expr.c
+++ b/sys/ddb/db_expr.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* All Rights Reserved.
diff --git a/sys/ddb/db_input.c b/sys/ddb/db_input.c
index fa66c0f7bae0..27af2655c19b 100644
--- a/sys/ddb/db_input.c
+++ b/sys/ddb/db_input.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* All Rights Reserved.
diff --git a/sys/ddb/db_lex.c b/sys/ddb/db_lex.c
index b8b2e3b22315..a04103b00deb 100644
--- a/sys/ddb/db_lex.c
+++ b/sys/ddb/db_lex.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* All Rights Reserved.
diff --git a/sys/ddb/db_lex.h b/sys/ddb/db_lex.h
index 538a86675035..07955e9dc5cd 100644
--- a/sys/ddb/db_lex.h
+++ b/sys/ddb/db_lex.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* All Rights Reserved.
diff --git a/sys/ddb/db_main.c b/sys/ddb/db_main.c
index 8344deed47a3..d047aebcec82 100644
--- a/sys/ddb/db_main.c
+++ b/sys/ddb/db_main.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* All Rights Reserved.
diff --git a/sys/ddb/db_output.c b/sys/ddb/db_output.c
index 27e57a5a10fe..3a0fbc5b73d4 100644
--- a/sys/ddb/db_output.c
+++ b/sys/ddb/db_output.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* All Rights Reserved.
diff --git a/sys/ddb/db_output.h b/sys/ddb/db_output.h
index cca5a8975379..7615ea67f6cd 100644
--- a/sys/ddb/db_output.h
+++ b/sys/ddb/db_output.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* All Rights Reserved.
diff --git a/sys/ddb/db_print.c b/sys/ddb/db_print.c
index b173c8ca95e3..8f3f93d5500a 100644
--- a/sys/ddb/db_print.c
+++ b/sys/ddb/db_print.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* All Rights Reserved.
diff --git a/sys/ddb/db_run.c b/sys/ddb/db_run.c
index ab589d387005..e30750dc3013 100644
--- a/sys/ddb/db_run.c
+++ b/sys/ddb/db_run.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* All Rights Reserved.
diff --git a/sys/ddb/db_sym.c b/sys/ddb/db_sym.c
index 5714950aecc7..fd7596fb4350 100644
--- a/sys/ddb/db_sym.c
+++ b/sys/ddb/db_sym.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* All Rights Reserved.
diff --git a/sys/ddb/db_sym.h b/sys/ddb/db_sym.h
index 8fb5866bac68..f68ccbcaf726 100644
--- a/sys/ddb/db_sym.h
+++ b/sys/ddb/db_sym.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* All Rights Reserved.
diff --git a/sys/ddb/db_thread.c b/sys/ddb/db_thread.c
index 5a8557a0a651..5b50f5657d92 100644
--- a/sys/ddb/db_thread.c
+++ b/sys/ddb/db_thread.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/ddb/db_variables.c b/sys/ddb/db_variables.c
index 6322a33b535e..706ebe60ec94 100644
--- a/sys/ddb/db_variables.c
+++ b/sys/ddb/db_variables.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* All Rights Reserved.
diff --git a/sys/ddb/db_variables.h b/sys/ddb/db_variables.h
index 7f7a463bdcfe..1ff0e4442d00 100644
--- a/sys/ddb/db_variables.h
+++ b/sys/ddb/db_variables.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* All Rights Reserved.
diff --git a/sys/ddb/db_watch.c b/sys/ddb/db_watch.c
index af3e7d51d16b..6aa8103758d7 100644
--- a/sys/ddb/db_watch.c
+++ b/sys/ddb/db_watch.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* All Rights Reserved.
diff --git a/sys/ddb/db_watch.h b/sys/ddb/db_watch.h
index 18943f43942d..7c48ce8af1b1 100644
--- a/sys/ddb/db_watch.h
+++ b/sys/ddb/db_watch.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* All Rights Reserved.
diff --git a/sys/ddb/db_write_cmd.c b/sys/ddb/db_write_cmd.c
index 69353c13183e..64d347364875 100644
--- a/sys/ddb/db_write_cmd.c
+++ b/sys/ddb/db_write_cmd.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* All Rights Reserved.
diff --git a/sys/ddb/ddb.h b/sys/ddb/ddb.h
index 44caeea37bce..ba667052b303 100644
--- a/sys/ddb/ddb.h
+++ b/sys/ddb/ddb.h
@@ -39,8 +39,6 @@
#include <machine/db_machdep.h> /* type definitions */
-#define DB_LINES_PER_PAGE db_lines_per_page
-
typedef void db_cmdfcn_t(db_expr_t addr, boolean_t have_addr, db_expr_t count,
char *modif);
diff --git a/sys/dev/aac/aac_cam.c b/sys/dev/aac/aac_cam.c
index 946855425f70..3755e58de742 100644
--- a/sys/dev/aac/aac_cam.c
+++ b/sys/dev/aac/aac_cam.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2002 Adaptec, Inc.
* All rights reserved.
*
diff --git a/sys/dev/acpica/acpi_ec.c b/sys/dev/acpica/acpi_ec.c
index 1f168ca55952..bdf2f0e498bb 100644
--- a/sys/dev/acpica/acpi_ec.c
+++ b/sys/dev/acpica/acpi_ec.c
@@ -25,7 +25,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/******************************************************************************
+/*-
+ ******************************************************************************
*
* 1. Copyright Notice
*
diff --git a/sys/dev/acpica/acpi_pci.c b/sys/dev/acpica/acpi_pci.c
index ad51129d7f4b..c935ae8ffd45 100644
--- a/sys/dev/acpica/acpi_pci.c
+++ b/sys/dev/acpica/acpi_pci.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
* Copyright (c) 2000, Michael Smith <msmith@freebsd.org>
* Copyright (c) 2000, BSDi
diff --git a/sys/dev/adlink/adlink.c b/sys/dev/adlink/adlink.c
index b32ef3daa502..dc86c89aea77 100644
--- a/sys/dev/adlink/adlink.c
+++ b/sys/dev/adlink/adlink.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2003 Poul-Henning Kamp
+ * Copyright (c) 2003-2004 Poul-Henning Kamp
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/advansys/adv_eisa.c b/sys/dev/advansys/adv_eisa.c
index d71893861d57..e56cf29653f0 100644
--- a/sys/dev/advansys/adv_eisa.c
+++ b/sys/dev/advansys/adv_eisa.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Device probe and attach routines for the following
* Advanced Systems Inc. SCSI controllers:
*
diff --git a/sys/dev/advansys/adv_isa.c b/sys/dev/advansys/adv_isa.c
index 96bdc7c77ea7..8a3a0790843b 100644
--- a/sys/dev/advansys/adv_isa.c
+++ b/sys/dev/advansys/adv_isa.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Device probe and attach routines for the following
* Advanced Systems Inc. SCSI controllers:
*
diff --git a/sys/dev/advansys/adv_pci.c b/sys/dev/advansys/adv_pci.c
index 9ac61f394fa9..aa97f1ba0712 100644
--- a/sys/dev/advansys/adv_pci.c
+++ b/sys/dev/advansys/adv_pci.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Device probe and attach routines for the following
* Advanced Systems Inc. SCSI controllers:
*
diff --git a/sys/dev/advansys/advansys.c b/sys/dev/advansys/advansys.c
index 1c2d645a3fb0..7b9cfb1e3fb8 100644
--- a/sys/dev/advansys/advansys.c
+++ b/sys/dev/advansys/advansys.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Generic driver for the Advanced Systems Inc. SCSI controllers
* Product specific probe and attach routines can be found in:
*
@@ -32,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/*
+/*-
* Ported from:
* advansys.c - Linux Host Driver for AdvanSys SCSI Adapters
*
diff --git a/sys/dev/advansys/advansys.h b/sys/dev/advansys/advansys.h
index ab4e550a9afe..a8c560472860 100644
--- a/sys/dev/advansys/advansys.h
+++ b/sys/dev/advansys/advansys.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Generic driver definitions and exported functions for the Advanced
* Systems Inc. SCSI controllers
*
diff --git a/sys/dev/advansys/advlib.c b/sys/dev/advansys/advlib.c
index 7b9b149d1fc5..4604571da52f 100644
--- a/sys/dev/advansys/advlib.c
+++ b/sys/dev/advansys/advlib.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Low level routines for the Advanced Systems Inc. SCSI controllers chips
*
* Copyright (c) 1996-1997, 1999-2000 Justin Gibbs.
@@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/*
+/*-
* Ported from:
* advansys.c - Linux Host Driver for AdvanSys SCSI Adapters
*
diff --git a/sys/dev/advansys/advlib.h b/sys/dev/advansys/advlib.h
index ba9703db1b6d..f7a3acb633b5 100644
--- a/sys/dev/advansys/advlib.h
+++ b/sys/dev/advansys/advlib.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Definitions for low level routines and data structures
* for the Advanced Systems Inc. SCSI controllers chips.
*
@@ -31,7 +31,7 @@
*
* $FreeBSD$
*/
-/*
+/*-
* Ported from:
* advansys.c - Linux Host Driver for AdvanSys SCSI Adapters
*
diff --git a/sys/dev/advansys/advmcode.c b/sys/dev/advansys/advmcode.c
index 730f161f31f9..d5e7bba9634a 100644
--- a/sys/dev/advansys/advmcode.c
+++ b/sys/dev/advansys/advmcode.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Downloadable microcode for Advanced Systems Inc. SCSI controllers
*
*
diff --git a/sys/dev/advansys/advmcode.h b/sys/dev/advansys/advmcode.h
index 128efc4c9715..60b4e03cdb1a 100644
--- a/sys/dev/advansys/advmcode.h
+++ b/sys/dev/advansys/advmcode.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Exported interface to downloadable microcode for AdvanSys SCSI Adapters
*
* $FreeBSD$
diff --git a/sys/dev/advansys/adw_pci.c b/sys/dev/advansys/adw_pci.c
index e6050b885d7c..1f88d772a79e 100644
--- a/sys/dev/advansys/adw_pci.c
+++ b/sys/dev/advansys/adw_pci.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Device probe and attach routines for the following
* Advanced Systems Inc. SCSI controllers:
*
diff --git a/sys/dev/advansys/adwcam.c b/sys/dev/advansys/adwcam.c
index 400c0fca5271..c6c14fd99cc0 100644
--- a/sys/dev/advansys/adwcam.c
+++ b/sys/dev/advansys/adwcam.c
@@ -1,4 +1,4 @@
-/*
+/*-
* CAM SCSI interface for the the Advanced Systems Inc.
* Second Generation SCSI controllers.
*
diff --git a/sys/dev/advansys/adwlib.c b/sys/dev/advansys/adwlib.c
index d36ca351b977..9dbf21eb41a6 100644
--- a/sys/dev/advansys/adwlib.c
+++ b/sys/dev/advansys/adwlib.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Low level routines for Second Generation
* Advanced Systems Inc. SCSI controllers chips
*
@@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/*
+/*-
* Ported from:
* advansys.c - Linux Host Driver for AdvanSys SCSI Adapters
*
diff --git a/sys/dev/advansys/adwlib.h b/sys/dev/advansys/adwlib.h
index 53834474e464..a1d72ec7c383 100644
--- a/sys/dev/advansys/adwlib.h
+++ b/sys/dev/advansys/adwlib.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Definitions for low level routines and data structures
* for the Advanced Systems Inc. SCSI controllers chips.
*
@@ -31,7 +31,7 @@
*
* $FreeBSD$
*/
-/*
+/*-
* Ported from:
* advansys.c - Linux Host Driver for AdvanSys SCSI Adapters
*
diff --git a/sys/dev/advansys/adwmcode.c b/sys/dev/advansys/adwmcode.c
index 2b643291453f..a43720c423dd 100644
--- a/sys/dev/advansys/adwmcode.c
+++ b/sys/dev/advansys/adwmcode.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Downloadable microcode for Second Generation
* Advanced Systems Inc. SCSI controllers
*
diff --git a/sys/dev/advansys/adwmcode.h b/sys/dev/advansys/adwmcode.h
index 221845489867..e3ab3f47a0ec 100644
--- a/sys/dev/advansys/adwmcode.h
+++ b/sys/dev/advansys/adwmcode.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Exported interface to downloadable microcode for AdvanSys SCSI Adapters
*
* $FreeBSD$
diff --git a/sys/dev/advansys/adwvar.h b/sys/dev/advansys/adwvar.h
index f4244f98a484..0510ab0185c3 100644
--- a/sys/dev/advansys/adwvar.h
+++ b/sys/dev/advansys/adwvar.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Generic driver definitions and exported functions for the Advanced
* Systems Inc. Second Generation SCSI controllers
*
diff --git a/sys/dev/aha/aha.c b/sys/dev/aha/aha.c
index 919b1ecd6764..c6025420c2df 100644
--- a/sys/dev/aha/aha.c
+++ b/sys/dev/aha/aha.c
@@ -2,9 +2,10 @@
* Generic register and struct definitions for the Adaptech 154x/164x
* SCSI host adapters. Product specific probe and attach routines can
* be found in:
- * aha 1542B/1542C/1542CF/1542CP aha_isa.c
+ * aha 1542A/1542B/1542C/1542CF/1542CP aha_isa.c
* aha 1640 aha_mca.c
- *
+ */
+/*-
* Copyright (c) 1998 M. Warner Losh.
* All Rights Reserved.
*
@@ -12,16 +13,16 @@
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions, and the following disclaimer,
- * without modification, immediately at the beginning of the file.
- * 2. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
diff --git a/sys/dev/aha/aha_isa.c b/sys/dev/aha/aha_isa.c
index 7215cb069cbd..a9115eacd0be 100644
--- a/sys/dev/aha/aha_isa.c
+++ b/sys/dev/aha/aha_isa.c
@@ -1,7 +1,8 @@
/*
* Product specific probe and attach routines for:
* Adaptec 154x.
- *
+ */
+/*-
* Copyright (c) 1999-2003 M. Warner Losh
* All rights reserved.
*
diff --git a/sys/dev/aha/ahareg.h b/sys/dev/aha/ahareg.h
index c64d8ea06a73..c5b61f813977 100644
--- a/sys/dev/aha/ahareg.h
+++ b/sys/dev/aha/ahareg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Generic register and struct definitions for the Adaptech 1540, 1542,
* 1640, 1642 SCSI host adapters. Product specific probe and attach
* routines can be found in:
diff --git a/sys/dev/ahb/ahb.c b/sys/dev/ahb/ahb.c
index 34b16afd3791..4d7249c5aaa6 100644
--- a/sys/dev/ahb/ahb.c
+++ b/sys/dev/ahb/ahb.c
@@ -1,4 +1,4 @@
-/*
+/*-
* CAM SCSI device driver for the Adaptec 174X SCSI Host adapter
*
* Copyright (c) 1998 Justin T. Gibbs
diff --git a/sys/dev/ahb/ahbreg.h b/sys/dev/ahb/ahbreg.h
index c72f068aa3b9..d4544434eadb 100644
--- a/sys/dev/ahb/ahbreg.h
+++ b/sys/dev/ahb/ahbreg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Hardware structure definitions for the Adaptec 174X CAM SCSI device driver.
*
* Copyright (c) 1998 Justin T. Gibbs
diff --git a/sys/dev/aic/aic6360reg.h b/sys/dev/aic/aic6360reg.h
index d08a66514228..53962aed9d35 100644
--- a/sys/dev/aic/aic6360reg.h
+++ b/sys/dev/aic/aic6360reg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1994 Charles Hannum.
* Copyright (c) 1994 Jarle Greipsland.
* All rights reserved.
diff --git a/sys/dev/aic7xxx/ahc_eisa.c b/sys/dev/aic7xxx/ahc_eisa.c
index b3fa8e3782a4..f98059f69016 100644
--- a/sys/dev/aic7xxx/ahc_eisa.c
+++ b/sys/dev/aic7xxx/ahc_eisa.c
@@ -1,4 +1,4 @@
-/*
+/*-
* FreeBSD, EISA product support functions
*
*
diff --git a/sys/dev/aic7xxx/ahc_isa.c b/sys/dev/aic7xxx/ahc_isa.c
index 1515a68d60b9..d01ffc96d3f8 100644
--- a/sys/dev/aic7xxx/ahc_isa.c
+++ b/sys/dev/aic7xxx/ahc_isa.c
@@ -1,4 +1,4 @@
-/*
+/*-
* FreeBSD, VLB/ISA product support functions
*
* Copyright (c) 2004 Justin T. Gibbs.
diff --git a/sys/dev/aic7xxx/ahc_pci.c b/sys/dev/aic7xxx/ahc_pci.c
index ba6ab22aa8ee..a9d4478420af 100644
--- a/sys/dev/aic7xxx/ahc_pci.c
+++ b/sys/dev/aic7xxx/ahc_pci.c
@@ -1,4 +1,4 @@
-/*
+/*-
* FreeBSD, PCI product support functions
*
* Copyright (c) 1995-2001 Justin T. Gibbs
diff --git a/sys/dev/aic7xxx/ahd_pci.c b/sys/dev/aic7xxx/ahd_pci.c
index 18ac5f3225e9..01439442b7cf 100644
--- a/sys/dev/aic7xxx/ahd_pci.c
+++ b/sys/dev/aic7xxx/ahd_pci.c
@@ -1,4 +1,4 @@
-/*
+/*-
* FreeBSD, PCI product support functions
*
* Copyright (c) 1995-2001 Justin T. Gibbs
diff --git a/sys/dev/aic7xxx/aic7770.c b/sys/dev/aic7xxx/aic7770.c
index d6b35a04f731..1ce48f9b8df9 100644
--- a/sys/dev/aic7xxx/aic7770.c
+++ b/sys/dev/aic7xxx/aic7770.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Product specific probe and attach routines for:
* 27/284X and aic7770 motherboard SCSI controllers
*
diff --git a/sys/dev/aic7xxx/aic79xx.c b/sys/dev/aic7xxx/aic79xx.c
index ca8e2a951e75..dba0190d5c8d 100644
--- a/sys/dev/aic7xxx/aic79xx.c
+++ b/sys/dev/aic7xxx/aic79xx.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Core routines and tables shareable across OS platforms.
*
* Copyright (c) 1994-2002, 2004 Justin T. Gibbs.
diff --git a/sys/dev/aic7xxx/aic79xx.h b/sys/dev/aic7xxx/aic79xx.h
index 3e17ba9315af..76ab264cb558 100644
--- a/sys/dev/aic7xxx/aic79xx.h
+++ b/sys/dev/aic7xxx/aic79xx.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Core definitions and data structures shareable across OS platforms.
*
* Copyright (c) 1994-2002 Justin T. Gibbs.
diff --git a/sys/dev/aic7xxx/aic79xx.reg b/sys/dev/aic7xxx/aic79xx.reg
index e3cc7c5deff2..e856b6236eae 100644
--- a/sys/dev/aic7xxx/aic79xx.reg
+++ b/sys/dev/aic7xxx/aic79xx.reg
@@ -1,4 +1,4 @@
-/*
+/*-
* Aic79xx register and scratch ram definitions.
*
* Copyright (c) 1994-2001, 2004 Justin T. Gibbs.
diff --git a/sys/dev/aic7xxx/aic79xx.seq b/sys/dev/aic7xxx/aic79xx.seq
index 56ac75505a09..d8d4f921380c 100644
--- a/sys/dev/aic7xxx/aic79xx.seq
+++ b/sys/dev/aic7xxx/aic79xx.seq
@@ -1,4 +1,4 @@
-/*
+/*-
* Adaptec U320 device driver firmware for Linux and FreeBSD.
*
* Copyright (c) 1994-2001, 2004 Justin T. Gibbs.
diff --git a/sys/dev/aic7xxx/aic79xx_inline.h b/sys/dev/aic7xxx/aic79xx_inline.h
index 0498ab312940..064a5e8ddd7f 100644
--- a/sys/dev/aic7xxx/aic79xx_inline.h
+++ b/sys/dev/aic7xxx/aic79xx_inline.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Inline routines shareable across OS platforms.
*
* Copyright (c) 1994-2001 Justin T. Gibbs.
diff --git a/sys/dev/aic7xxx/aic79xx_osm.c b/sys/dev/aic7xxx/aic79xx_osm.c
index 458f634727d3..2319da871a7f 100644
--- a/sys/dev/aic7xxx/aic79xx_osm.c
+++ b/sys/dev/aic7xxx/aic79xx_osm.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Bus independent FreeBSD shim for the aic79xx based Adaptec SCSI controllers
*
* Copyright (c) 1994-2002, 2004 Justin T. Gibbs.
diff --git a/sys/dev/aic7xxx/aic79xx_osm.h b/sys/dev/aic7xxx/aic79xx_osm.h
index 924ef1bb4689..c6f36f1d8700 100644
--- a/sys/dev/aic7xxx/aic79xx_osm.h
+++ b/sys/dev/aic7xxx/aic79xx_osm.h
@@ -1,4 +1,4 @@
-/*
+/*-
* FreeBSD platform specific driver option settings, data structures,
* function declarations and includes.
*
diff --git a/sys/dev/aic7xxx/aic79xx_pci.c b/sys/dev/aic7xxx/aic79xx_pci.c
index 6f917b90da24..7c8adde6a9f7 100644
--- a/sys/dev/aic7xxx/aic79xx_pci.c
+++ b/sys/dev/aic7xxx/aic79xx_pci.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Product specific probe and attach routines for:
* aic7901 and aic7902 SCSI controllers
*
diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c
index 4bf646610bd0..9bd4cafed241 100644
--- a/sys/dev/aic7xxx/aic7xxx.c
+++ b/sys/dev/aic7xxx/aic7xxx.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Core routines and tables shareable across OS platforms.
*
* Copyright (c) 1994-2002 Justin T. Gibbs.
diff --git a/sys/dev/aic7xxx/aic7xxx.h b/sys/dev/aic7xxx/aic7xxx.h
index fc72f03df431..6f7ac9d8e5ef 100644
--- a/sys/dev/aic7xxx/aic7xxx.h
+++ b/sys/dev/aic7xxx/aic7xxx.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Core definitions and data structures shareable across OS platforms.
*
* Copyright (c) 1994-2001 Justin T. Gibbs.
diff --git a/sys/dev/aic7xxx/aic7xxx.reg b/sys/dev/aic7xxx/aic7xxx.reg
index e196d83b93c7..076c2ba49f92 100644
--- a/sys/dev/aic7xxx/aic7xxx.reg
+++ b/sys/dev/aic7xxx/aic7xxx.reg
@@ -1,4 +1,4 @@
-/*
+/*-
* Aic7xxx register and scratch ram definitions.
*
* Copyright (c) 1994-2001 Justin T. Gibbs.
diff --git a/sys/dev/aic7xxx/aic7xxx.seq b/sys/dev/aic7xxx/aic7xxx.seq
index 810d766beeaf..0eefaaa41b79 100644
--- a/sys/dev/aic7xxx/aic7xxx.seq
+++ b/sys/dev/aic7xxx/aic7xxx.seq
@@ -1,4 +1,4 @@
-/*
+/*-
* Adaptec 274x/284x/294x device driver firmware for Linux and FreeBSD.
*
* Copyright (c) 1994-2001 Justin T. Gibbs.
diff --git a/sys/dev/aic7xxx/aic7xxx_93cx6.c b/sys/dev/aic7xxx/aic7xxx_93cx6.c
index 6d08d2563848..ab63f181901b 100644
--- a/sys/dev/aic7xxx/aic7xxx_93cx6.c
+++ b/sys/dev/aic7xxx/aic7xxx_93cx6.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Interface for the 93C66/56/46/26/06 serial eeprom parts.
*
* Copyright (c) 1995, 1996 Daniel M. Eischen
diff --git a/sys/dev/aic7xxx/aic7xxx_93cx6.h b/sys/dev/aic7xxx/aic7xxx_93cx6.h
index 859c43ccdd46..3827015edcbb 100644
--- a/sys/dev/aic7xxx/aic7xxx_93cx6.h
+++ b/sys/dev/aic7xxx/aic7xxx_93cx6.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Interface to the 93C46/56 serial EEPROM that is used to store BIOS
* settings for the aic7xxx based adaptec SCSI controllers. It can
* also be used for 93C26 and 93C06 serial EEPROMS.
diff --git a/sys/dev/aic7xxx/aic7xxx_inline.h b/sys/dev/aic7xxx/aic7xxx_inline.h
index e25e1049df2a..989ac79dfc24 100644
--- a/sys/dev/aic7xxx/aic7xxx_inline.h
+++ b/sys/dev/aic7xxx/aic7xxx_inline.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Inline routines shareable across OS platforms.
*
* Copyright (c) 1994-2001 Justin T. Gibbs.
diff --git a/sys/dev/aic7xxx/aic7xxx_osm.c b/sys/dev/aic7xxx/aic7xxx_osm.c
index ba1eca22cd97..a1b65bb860f3 100644
--- a/sys/dev/aic7xxx/aic7xxx_osm.c
+++ b/sys/dev/aic7xxx/aic7xxx_osm.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Bus independent FreeBSD shim for the aic7xxx based Adaptec SCSI controllers
*
* Copyright (c) 1994-2001 Justin T. Gibbs.
diff --git a/sys/dev/aic7xxx/aic7xxx_osm.h b/sys/dev/aic7xxx/aic7xxx_osm.h
index 55d9697b6588..07752a3b5bc4 100644
--- a/sys/dev/aic7xxx/aic7xxx_osm.h
+++ b/sys/dev/aic7xxx/aic7xxx_osm.h
@@ -1,4 +1,4 @@
-/*
+/*-
* FreeBSD platform specific driver option settings, data structures,
* function declarations and includes.
*
diff --git a/sys/dev/aic7xxx/aic7xxx_pci.c b/sys/dev/aic7xxx/aic7xxx_pci.c
index fcb90b92174f..d37607daadd5 100644
--- a/sys/dev/aic7xxx/aic7xxx_pci.c
+++ b/sys/dev/aic7xxx/aic7xxx_pci.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Product specific probe and attach routines for:
* 3940, 2940, aic7895, aic7890, aic7880,
* aic7870, aic7860 and aic7850 SCSI controllers
diff --git a/sys/dev/aic7xxx/aic_osm_lib.c b/sys/dev/aic7xxx/aic_osm_lib.c
index 525fdcc2c00d..8919789c6db0 100644
--- a/sys/dev/aic7xxx/aic_osm_lib.c
+++ b/sys/dev/aic7xxx/aic_osm_lib.c
@@ -1,4 +1,4 @@
-/*
+/*-
* FreeBSD OSM Library for the aic7xxx aic79xx based Adaptec SCSI controllers
*
* Copyright (c) 1994-2002 Justin T. Gibbs.
diff --git a/sys/dev/aic7xxx/aic_osm_lib.h b/sys/dev/aic7xxx/aic_osm_lib.h
index f00d80b6887b..f54199ecea66 100644
--- a/sys/dev/aic7xxx/aic_osm_lib.h
+++ b/sys/dev/aic7xxx/aic_osm_lib.h
@@ -1,4 +1,4 @@
-/*
+/*-
* FreeBSD platform specific, shared driver option settings, data structures,
* function declarations and includes.
*
diff --git a/sys/dev/aic7xxx/aicasm/aicasm.c b/sys/dev/aic7xxx/aicasm/aicasm.c
index 0c780f9065be..ad010649c8b5 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm.c
+++ b/sys/dev/aic7xxx/aicasm/aicasm.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Aic7xxx SCSI host adapter firmware asssembler
*
* Copyright (c) 1997, 1998, 2000, 2001 Justin T. Gibbs.
diff --git a/sys/dev/aic7xxx/aicasm/aicasm.h b/sys/dev/aic7xxx/aicasm/aicasm.h
index 51678dd46ff7..440cb495f955 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm.h
+++ b/sys/dev/aic7xxx/aicasm/aicasm.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Assembler for the sequencer program downloaded to Aic7xxx SCSI host adapters
*
* Copyright (c) 1997 Justin T. Gibbs.
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_gram.y b/sys/dev/aic7xxx/aicasm/aicasm_gram.y
index 67e046d96625..f96116d0f9cb 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_gram.y
+++ b/sys/dev/aic7xxx/aicasm/aicasm_gram.y
@@ -1,5 +1,5 @@
%{
-/*
+/*-
* Parser for the Aic7xxx SCSI Host adapter sequencer assembler.
*
* Copyright (c) 1997, 1998, 2000 Justin T. Gibbs.
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_insformat.h b/sys/dev/aic7xxx/aicasm/aicasm_insformat.h
index 3e80f07df49c..820310b469cd 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_insformat.h
+++ b/sys/dev/aic7xxx/aicasm/aicasm_insformat.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Instruction formats for the sequencer program downloaded to
* Aic7xxx SCSI host adapters
*
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y b/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
index 439f760b34b5..48551c6b0f84 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
+++ b/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
@@ -1,5 +1,5 @@
%{
-/*
+/*-
* Sub-parser for macro invocation in the Aic7xxx SCSI
* Host adapter sequencer assembler.
*
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l b/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
index f06e7035cb35..49557a8837f8 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
+++ b/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
@@ -1,5 +1,5 @@
%{
-/*
+/*-
* Sub-Lexical Analyzer for macro invokation in
* the Aic7xxx SCSI Host adapter sequencer assembler.
*
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_scan.l b/sys/dev/aic7xxx/aicasm/aicasm_scan.l
index 45c0b233d0bc..ced09dc2b12b 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_scan.l
+++ b/sys/dev/aic7xxx/aicasm/aicasm_scan.l
@@ -1,5 +1,5 @@
%{
-/*
+/*-
* Lexical Analyzer for the Aic7xxx SCSI Host adapter sequencer assembler.
*
* Copyright (c) 1997, 1998, 2000 Justin T. Gibbs.
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_symbol.c b/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
index f1f448dff569..9770a71b8d09 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
+++ b/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Aic7xxx SCSI host adapter firmware asssembler symbol table implementation
*
* Copyright (c) 1997 Justin T. Gibbs.
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_symbol.h b/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
index afc22e8b4903..1496c3768c81 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
+++ b/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Aic7xxx SCSI host adapter firmware asssembler symbol table definitions
*
* Copyright (c) 1997 Justin T. Gibbs.
diff --git a/sys/dev/amd/amd.c b/sys/dev/amd/amd.c
index b885bf44464e..0c9f28979f36 100644
--- a/sys/dev/amd/amd.c
+++ b/sys/dev/amd/amd.c
@@ -1,4 +1,4 @@
-/*
+/*-
*********************************************************************
* FILE NAME : amd.c
* BY : C.L. Huang (ching@tekram.com.tw)
diff --git a/sys/dev/amd/amd.h b/sys/dev/amd/amd.h
index 6171bcfe322a..d9b8cd209b34 100644
--- a/sys/dev/amd/amd.h
+++ b/sys/dev/amd/amd.h
@@ -1,4 +1,4 @@
-/*
+/*-
*********************************************************************
* FILE NAME : amd.h
* BY : C.L. Huang (ching@tekram.com.tw)
diff --git a/sys/dev/amr/amr.c b/sys/dev/amr/amr.c
index 8762a019159a..ebeb24b6584d 100644
--- a/sys/dev/amr/amr.c
+++ b/sys/dev/amr/amr.c
@@ -1,6 +1,7 @@
/*-
* Copyright (c) 1999,2000 Michael Smith
* Copyright (c) 2000 BSDi
+ * Copyright (c) 2005 Scott Long
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -24,9 +25,9 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/*
+/*-
* Copyright (c) 2002 Eric Moore
- * Copyright (c) 2002 LSI Logic Corporation
+ * Copyright (c) 2002, 2004 LSI Logic Corporation
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/amr/amr_cam.c b/sys/dev/amr/amr_cam.c
index bd4cdb99c4fd..17cd8356f7f1 100644
--- a/sys/dev/amr/amr_cam.c
+++ b/sys/dev/amr/amr_cam.c
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/*
+/*-
* Copyright (c) 2002 Eric Moore
* Copyright (c) 2002 LSI Logic Corporation
* All rights reserved.
diff --git a/sys/dev/amr/amr_disk.c b/sys/dev/amr/amr_disk.c
index 8c520adc5a47..da7e94eb8a43 100644
--- a/sys/dev/amr/amr_disk.c
+++ b/sys/dev/amr/amr_disk.c
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/*
+/*-
* Copyright (c) 2002 Eric Moore
* Copyright (c) 2002 LSI Logic Corporation
* All rights reserved.
diff --git a/sys/dev/amr/amr_pci.c b/sys/dev/amr/amr_pci.c
index f4cf4ac4356e..eccb4d1bf3a7 100644
--- a/sys/dev/amr/amr_pci.c
+++ b/sys/dev/amr/amr_pci.c
@@ -24,9 +24,9 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/*
+/*-
* Copyright (c) 2002 Eric Moore
- * Copyright (c) 2002 LSI Logic Corporation
+ * Copyright (c) 2002, 2004 LSI Logic Corporation
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/an/if_aironet_ieee.h b/sys/dev/an/if_aironet_ieee.h
index a838424f5a81..28e4f72148e9 100644
--- a/sys/dev/an/if_aironet_ieee.h
+++ b/sys/dev/an/if_aironet_ieee.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/an/if_an.c b/sys/dev/an/if_an.c
index c3487386e14f..29b0adb571c8 100644
--- a/sys/dev/an/if_an.c
+++ b/sys/dev/an/if_an.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/an/if_an_isa.c b/sys/dev/an/if_an_isa.c
index 92b9d1c379eb..7144cc8778ad 100644
--- a/sys/dev/an/if_an_isa.c
+++ b/sys/dev/an/if_an_isa.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/an/if_an_pccard.c b/sys/dev/an/if_an_pccard.c
index 7b22eace94ad..ad37b67de5a2 100644
--- a/sys/dev/an/if_an_pccard.c
+++ b/sys/dev/an/if_an_pccard.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/an/if_anreg.h b/sys/dev/an/if_anreg.h
index 47db1be4e98f..12a03f004ade 100644
--- a/sys/dev/an/if_anreg.h
+++ b/sys/dev/an/if_anreg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c
index 7777e89348b7..70abc1d04b0c 100644
--- a/sys/dev/ar/if_ar.c
+++ b/sys/dev/ar/if_ar.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1995 - 2001 John Hay. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/ar/if_ar.h b/sys/dev/ar/if_ar.h
index 875e42a6745c..a6fc8cf088ec 100644
--- a/sys/dev/ar/if_ar.h
+++ b/sys/dev/ar/if_ar.h
@@ -1,4 +1,4 @@
-/*
+/*-
* if_ar.h
*
* Copyright (C) 1997-1999 Whistle Communications Inc.
diff --git a/sys/dev/ar/if_ar_isa.c b/sys/dev/ar/if_ar_isa.c
index fe07afb8d5b7..81c001f35e8a 100644
--- a/sys/dev/ar/if_ar_isa.c
+++ b/sys/dev/ar/if_ar_isa.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1995 - 2001 John Hay. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/ar/if_arregs.h b/sys/dev/ar/if_arregs.h
index f73543522760..d643cafee44c 100644
--- a/sys/dev/ar/if_arregs.h
+++ b/sys/dev/ar/if_arregs.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1995 - 2001 John Hay. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/asr/dptalign.h b/sys/dev/asr/dptalign.h
index bb72c5b67fb4..038dc6f4b5bb 100644
--- a/sys/dev/asr/dptalign.h
+++ b/sys/dev/asr/dptalign.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1996-1999 Distributed Processing Technology Corporation
* All rights reserved.
*
diff --git a/sys/dev/asr/dptsig.h b/sys/dev/asr/dptsig.h
index 94c0810ae3a1..a70ad114bdc3 100644
--- a/sys/dev/asr/dptsig.h
+++ b/sys/dev/asr/dptsig.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1996-2000 Distributed Processing Technology Corporation
* Copyright (c) 2000-2001 Adaptec Corporation.
* All rights reserved.
diff --git a/sys/dev/asr/i2oadptr.h b/sys/dev/asr/i2oadptr.h
index d880e4793a30..c189d8d658d9 100644
--- a/sys/dev/asr/i2oadptr.h
+++ b/sys/dev/asr/i2oadptr.h
@@ -1,4 +1,5 @@
-/****************************************************************
+/*-
+ ****************************************************************
* Copyright (c) 1996-2000 Distributed Processing Technology Corporation
* Copyright (c) 2000 Adaptec Corproation.
* All rights reserved.
diff --git a/sys/dev/asr/i2obscsi.h b/sys/dev/asr/i2obscsi.h
index 06ee30ce662c..a6666feb661b 100644
--- a/sys/dev/asr/i2obscsi.h
+++ b/sys/dev/asr/i2obscsi.h
@@ -1,4 +1,5 @@
-/****************************************************************
+/*-
+ ****************************************************************
* Copyright (c) 1996-2000 Distributed Processing Technology Corporation
* Copyright (c) 2000 Adaptec Corporation.
* All rights reserved.
diff --git a/sys/dev/asr/i2odep.h b/sys/dev/asr/i2odep.h
index 6b2fe5c5ee60..c1e6e5067ce2 100644
--- a/sys/dev/asr/i2odep.h
+++ b/sys/dev/asr/i2odep.h
@@ -1,4 +1,5 @@
-/****************************************************************************
+/*-
+ ****************************************************************************
*
* Copyright (c) 1996-2000 Distributed Processing Technology Corporation
* Copyright (c) 2000 Adaptec Corporation.
diff --git a/sys/dev/asr/i2odpt.h b/sys/dev/asr/i2odpt.h
index 9435b7cf19a5..4c9a9d462318 100644
--- a/sys/dev/asr/i2odpt.h
+++ b/sys/dev/asr/i2odpt.h
@@ -1,4 +1,5 @@
-/****************************************************************
+/*-
+ *****************************************************************
* Copyright (c) 1996-2000 Distributed Processing Technology Corporation
* Copyright (c) 2000 Adaptec Corporation.
* All rights reserved.
diff --git a/sys/dev/asr/i2oexec.h b/sys/dev/asr/i2oexec.h
index e80030576568..ae4327a6cb80 100644
--- a/sys/dev/asr/i2oexec.h
+++ b/sys/dev/asr/i2oexec.h
@@ -1,4 +1,5 @@
-/****************************************************************
+/*-
+ ****************************************************************
* Copyright (c) 1996-2000 Distributed Processing Technology Corporation
* Copyright (c) 2000 Adaptec Corporation.
* All rights reserved.
diff --git a/sys/dev/asr/i2omsg.h b/sys/dev/asr/i2omsg.h
index 23f2791aa3a3..833bd9173d38 100644
--- a/sys/dev/asr/i2omsg.h
+++ b/sys/dev/asr/i2omsg.h
@@ -1,4 +1,5 @@
-/****************************************************************
+/*-
+ ****************************************************************
* Copyright (c) 1996-2000 Distributed Processing Technology Corporation
* Copyright (c) 2000 Adaptec Corporation.
* All rights reserved.
diff --git a/sys/dev/asr/i2otypes.h b/sys/dev/asr/i2otypes.h
index eaa97c71342f..c85d92dd2c32 100644
--- a/sys/dev/asr/i2otypes.h
+++ b/sys/dev/asr/i2otypes.h
@@ -1,4 +1,5 @@
-/****************************************************************
+/*-
+ ****************************************************************
* Copyright (c) 1996-2000 Distributed Processing Technology Corporation
* Copyright (c) 2000 Adaptec Corporation.
* All rights reserved.
diff --git a/sys/dev/asr/i2outil.h b/sys/dev/asr/i2outil.h
index 3262dcda5244..c7e3061dbb28 100644
--- a/sys/dev/asr/i2outil.h
+++ b/sys/dev/asr/i2outil.h
@@ -1,4 +1,5 @@
-/****************************************************************
+/*-
+ ****************************************************************
* Copyright (c) 1996-2000 Distributed Processing Technology Corporation
* Copyright (c) 2000 Adaptec Corporation.
* All rights reserved.
diff --git a/sys/dev/asr/osd_defs.h b/sys/dev/asr/osd_defs.h
index 871d8f92c1ca..c954be9816b1 100644
--- a/sys/dev/asr/osd_defs.h
+++ b/sys/dev/asr/osd_defs.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1996-1999 Distributed Processing Technology Corporation
* All rights reserved.
*
diff --git a/sys/dev/asr/osd_unix.h b/sys/dev/asr/osd_unix.h
index e1309e4f0ddc..04f7a29b6969 100644
--- a/sys/dev/asr/osd_unix.h
+++ b/sys/dev/asr/osd_unix.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1996-1999 Distributed Processing Technology Corporation
* All rights reserved.
*
diff --git a/sys/dev/asr/osd_util.h b/sys/dev/asr/osd_util.h
index a243c04d1edb..baa233804a3f 100644
--- a/sys/dev/asr/osd_util.h
+++ b/sys/dev/asr/osd_util.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1996-1999 Distributed Processing Technology Corporation
* All rights reserved.
*
diff --git a/sys/dev/asr/sys_info.h b/sys/dev/asr/sys_info.h
index 80da928e7cbb..b4c78fe819fd 100644
--- a/sys/dev/asr/sys_info.h
+++ b/sys/dev/asr/sys_info.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1996-1999 Distributed Processing Technology Corporation
* All rights reserved.
*
diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c
index dde23cde82d9..89fa1459f681 100644
--- a/sys/dev/ath/if_ath.c
+++ b/sys/dev/ath/if_ath.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting
+ * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/ath/if_ath_pci.c b/sys/dev/ath/if_ath_pci.c
index 194d1671747c..194855852ef3 100644
--- a/sys/dev/ath/if_ath_pci.c
+++ b/sys/dev/ath/if_ath_pci.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting
+ * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/ath/if_athioctl.h b/sys/dev/ath/if_athioctl.h
index f0015ee92c47..9d562561e2d7 100644
--- a/sys/dev/ath/if_athioctl.h
+++ b/sys/dev/ath/if_athioctl.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting
+ * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/ath/if_athvar.h b/sys/dev/ath/if_athvar.h
index 0d3598981881..c4e2b0344dfc 100644
--- a/sys/dev/ath/if_athvar.h
+++ b/sys/dev/ath/if_athvar.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting
+ * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/auxio/auxio.c b/sys/dev/auxio/auxio.c
index 74d68808b743..ebd0e254b18e 100644
--- a/sys/dev/auxio/auxio.c
+++ b/sys/dev/auxio/auxio.c
@@ -27,7 +27,7 @@
/* $NetBSD: auxio.c,v 1.11 2003/07/15 03:36:04 lukem Exp $ */
-/*
+/*-
* Copyright (c) 2000, 2001 Matthew R. Green
* All rights reserved.
*
diff --git a/sys/dev/auxio/auxioreg.h b/sys/dev/auxio/auxioreg.h
index 439bf3487434..0c9ce8e9fa93 100644
--- a/sys/dev/auxio/auxioreg.h
+++ b/sys/dev/auxio/auxioreg.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* $NetBSD: auxioreg.h,v 1.4 2001/10/22 07:31:41 mrg Exp $ */
-/*
+/*-
* Copyright (c) 2000 Matthew R. Green
* All rights reserved.
*
diff --git a/sys/dev/awi/if_awi_pccard.c b/sys/dev/awi/if_awi_pccard.c
index 683790a5cb80..1f00ff7a51a1 100644
--- a/sys/dev/awi/if_awi_pccard.c
+++ b/sys/dev/awi/if_awi_pccard.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000 Atsushi Onoe <onoe@sm.sony.co.jp>
* All rights reserved.
*
diff --git a/sys/dev/bfe/if_bfe.c b/sys/dev/bfe/if_bfe.c
index 805cd2669e19..57f1c9943cdd 100644
--- a/sys/dev/bfe/if_bfe.c
+++ b/sys/dev/bfe/if_bfe.c
@@ -1,9 +1,7 @@
-/*
+/*-
* Copyright (c) 2003 Stuart Walsh<stu@ipng.org.uk>
* and Duncan Barclay<dmlb@dmlb.org>
- */
-
-/*
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
diff --git a/sys/dev/bfe/if_bfereg.h b/sys/dev/bfe/if_bfereg.h
index 10b26db81771..4228650eeb9c 100644
--- a/sys/dev/bfe/if_bfereg.h
+++ b/sys/dev/bfe/if_bfereg.h
@@ -1,5 +1,6 @@
-/* Copyright (c) 2003 Stuart Walsh */
-/*
+/*-
+ * Copyright (c) 2003 Stuart Walsh
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c
index 6fdc47d3e54d..4d1c7abb04b1 100644
--- a/sys/dev/bge/if_bge.c
+++ b/sys/dev/bge/if_bge.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2001
* Bill Paul <wpaul@windriver.com>. All rights reserved.
diff --git a/sys/dev/bge/if_bgereg.h b/sys/dev/bge/if_bgereg.h
index 7b2d5cb3ce09..a145c662f6d1 100644
--- a/sys/dev/bge/if_bgereg.h
+++ b/sys/dev/bge/if_bgereg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2001
* Bill Paul <wpaul@windriver.com>. All rights reserved.
diff --git a/sys/dev/bktr/bktr_audio.h b/sys/dev/bktr/bktr_audio.h
index 9b7500703b24..c05e40c31ea3 100644
--- a/sys/dev/bktr/bktr_audio.h
+++ b/sys/dev/bktr/bktr_audio.h
@@ -13,7 +13,7 @@
*
*/
-/*
+/*-
* 1. Redistributions of source code must retain the
* Copyright (c) 1997 Amancio Hasty, 1999 Roger Hardiman
* All rights reserved.
diff --git a/sys/dev/bktr/bktr_card.h b/sys/dev/bktr/bktr_card.h
index 91c8defcc224..29430d459e6b 100644
--- a/sys/dev/bktr/bktr_card.h
+++ b/sys/dev/bktr/bktr_card.h
@@ -14,7 +14,7 @@
*
*/
-/*
+/*-
* 1. Redistributions of source code must retain the
* Copyright (c) 1997 Amancio Hasty, 1999 Roger Hardiman
* All rights reserved.
diff --git a/sys/dev/bktr/bktr_core.h b/sys/dev/bktr/bktr_core.h
index 315566f31a40..980ced76621a 100644
--- a/sys/dev/bktr/bktr_core.h
+++ b/sys/dev/bktr/bktr_core.h
@@ -15,7 +15,7 @@
*
*/
-/*
+/*-
* 1. Redistributions of source code must retain the
* Copyright (c) 1997 Amancio Hasty, 1999 Roger Hardiman
* All rights reserved.
diff --git a/sys/dev/bktr/bktr_mem.c b/sys/dev/bktr/bktr_mem.c
index 3adacce803a9..5683410db415 100644
--- a/sys/dev/bktr/bktr_mem.c
+++ b/sys/dev/bktr/bktr_mem.c
@@ -11,7 +11,7 @@
* time the bktr driver is loaded.
*/
-/*
+/*-
* 1. Redistributions of source code must retain the
* Copyright (c) 2000 Roger Hardiman
* All rights reserved.
diff --git a/sys/dev/bktr/bktr_mem.h b/sys/dev/bktr/bktr_mem.h
index 4c6d7a508ac7..8feb55206c11 100644
--- a/sys/dev/bktr/bktr_mem.h
+++ b/sys/dev/bktr/bktr_mem.h
@@ -13,7 +13,7 @@
* time the bktr driver is loaded.
*/
-/*
+/*-
* 1. Redistributions of source code must retain the
* Copyright (c) 2000 Roger Hardiman
* All rights reserved.
diff --git a/sys/dev/bktr/bktr_os.h b/sys/dev/bktr/bktr_os.h
index d2826022a94d..1cd708df3c6a 100644
--- a/sys/dev/bktr/bktr_os.h
+++ b/sys/dev/bktr/bktr_os.h
@@ -10,7 +10,7 @@
*
*/
-/*
+/*-
* 1. Redistributions of source code must retain the
* Copyright (c) 1997 Amancio Hasty, 1999 Roger Hardiman
* All rights reserved.
diff --git a/sys/dev/bktr/bktr_reg.h b/sys/dev/bktr/bktr_reg.h
index c8fc4d4bc7ea..e03b99a96e3d 100644
--- a/sys/dev/bktr/bktr_reg.h
+++ b/sys/dev/bktr/bktr_reg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* $FreeBSD$
*
* Copyright (c) 1999 Roger Hardiman
diff --git a/sys/dev/bktr/bktr_tuner.h b/sys/dev/bktr/bktr_tuner.h
index 338d1168f543..a1aa64a28d4a 100644
--- a/sys/dev/bktr/bktr_tuner.h
+++ b/sys/dev/bktr/bktr_tuner.h
@@ -10,7 +10,7 @@
*
*/
-/*
+/*-
* 1. Redistributions of source code must retain the
* Copyright (c) 1997 Amancio Hasty, 1999 Roger Hardiman
* All rights reserved.
diff --git a/sys/dev/bktr/ioctl_meteor.h b/sys/dev/bktr/ioctl_meteor.h
index 5f70a4b87ecd..681990aa03c0 100644
--- a/sys/dev/bktr/ioctl_meteor.h
+++ b/sys/dev/bktr/ioctl_meteor.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1995 Mark Tinguely and Jim Lowe
* All rights reserved.
*
diff --git a/sys/dev/buslogic/bt.c b/sys/dev/buslogic/bt.c
index 4920cdb351dc..74ad13b81875 100644
--- a/sys/dev/buslogic/bt.c
+++ b/sys/dev/buslogic/bt.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Generic driver for the BusLogic MultiMaster SCSI host adapters
* Product specific probe and attach routines can be found in:
* sys/dev/buslogic/bt_isa.c BT-54X, BT-445 cards
diff --git a/sys/dev/buslogic/bt_eisa.c b/sys/dev/buslogic/bt_eisa.c
index 3157503513a3..b1c40107aa78 100644
--- a/sys/dev/buslogic/bt_eisa.c
+++ b/sys/dev/buslogic/bt_eisa.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Product specific probe and attach routines for:
* Buslogic BT74x SCSI controllers
*
diff --git a/sys/dev/buslogic/bt_isa.c b/sys/dev/buslogic/bt_isa.c
index 3241abdb00c0..78f4b2e1133b 100644
--- a/sys/dev/buslogic/bt_isa.c
+++ b/sys/dev/buslogic/bt_isa.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Product specific probe and attach routines for:
* Buslogic BT-54X and BT-445 cards
*
diff --git a/sys/dev/buslogic/btreg.h b/sys/dev/buslogic/btreg.h
index 4a796f2a5813..be6e74f90ebe 100644
--- a/sys/dev/buslogic/btreg.h
+++ b/sys/dev/buslogic/btreg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Generic register and struct definitions for the BusLogic
* MultiMaster SCSI host adapters. Product specific probe and
* attach routines can be found in:
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c
index 29557d20fb13..cf65decab427 100644
--- a/sys/dev/cardbus/cardbus.c
+++ b/sys/dev/cardbus/cardbus.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003 M. Warner Losh. All Rights Reserved.
* Copyright (c) 2000,2001 Jonathan Chen. All rights reserved.
*
@@ -6,25 +6,22 @@
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions, and the following disclaimer,
- * without modification, immediately at the beginning of the file.
+ * notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
*/
#include <sys/cdefs.h>
diff --git a/sys/dev/cardbus/cardbus_cis.c b/sys/dev/cardbus/cardbus_cis.c
index e17b935aed2d..45cddf721c13 100644
--- a/sys/dev/cardbus/cardbus_cis.c
+++ b/sys/dev/cardbus/cardbus_cis.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000,2001 Jonathan Chen.
* All rights reserved.
*
@@ -6,25 +6,22 @@
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions, and the following disclaimer,
- * without modification, immediately at the beginning of the file.
+ * notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
*/
#include <sys/cdefs.h>
diff --git a/sys/dev/cardbus/cardbus_cis.h b/sys/dev/cardbus/cardbus_cis.h
index a56d13b9df97..93c81e6519f1 100644
--- a/sys/dev/cardbus/cardbus_cis.h
+++ b/sys/dev/cardbus/cardbus_cis.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000,2001 Jonathan Chen.
* All rights reserved.
*
@@ -6,18 +6,16 @@
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions, and the following disclaimer,
- * without modification, immediately at the beginning of the file.
+ * notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
diff --git a/sys/dev/cardbus/cardbusreg.h b/sys/dev/cardbus/cardbusreg.h
index c356323d2125..76332a0ddfd0 100644
--- a/sys/dev/cardbus/cardbusreg.h
+++ b/sys/dev/cardbus/cardbusreg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000,2001 Jonathan Chen.
* All rights reserved.
*
@@ -6,18 +6,16 @@
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions, and the following disclaimer,
- * without modification, immediately at the beginning of the file.
+ * notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
diff --git a/sys/dev/cardbus/cardbusvar.h b/sys/dev/cardbus/cardbusvar.h
index b8276894912d..a028e82cabc7 100644
--- a/sys/dev/cardbus/cardbusvar.h
+++ b/sys/dev/cardbus/cardbusvar.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000,2001 Jonathan Chen.
* All rights reserved.
*
@@ -6,18 +6,16 @@
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions, and the following disclaimer,
- * without modification, immediately at the beginning of the file.
+ * notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
diff --git a/sys/dev/cnw/if_cnwioctl.h b/sys/dev/cnw/if_cnwioctl.h
index 04e8c3b23727..cc1b54890a99 100644
--- a/sys/dev/cnw/if_cnwioctl.h
+++ b/sys/dev/cnw/if_cnwioctl.h
@@ -1,7 +1,7 @@
/* $NetBSD: if_cnwioctl.h,v 1.2 1999/11/29 12:54:00 itojun Exp $ */
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 1996, 1997 Berkeley Software Design, Inc.
* All rights reserved.
*
diff --git a/sys/dev/cp/cpddk.c b/sys/dev/cp/cpddk.c
index 1fbd22d57fea..7c82f9b85208 100644
--- a/sys/dev/cp/cpddk.c
+++ b/sys/dev/cp/cpddk.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Low-level subroutines for Cronyx Tau-PCI adapter.
*
* Copyright (C) 1999-2003 Cronyx Engineering.
diff --git a/sys/dev/cp/cpddk.h b/sys/dev/cp/cpddk.h
index 69d0512d66cb..3ff40bbd68d1 100644
--- a/sys/dev/cp/cpddk.h
+++ b/sys/dev/cp/cpddk.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Cronyx Tau-PCI DDK definitions.
*
* Copyright (C) 1999-2003 Cronyx Engineering.
diff --git a/sys/dev/cp/if_cp.c b/sys/dev/cp/if_cp.c
index 85d18360eff4..948ca141b75f 100644
--- a/sys/dev/cp/if_cp.c
+++ b/sys/dev/cp/if_cp.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Cronyx-Tau-PCI adapter driver for FreeBSD.
* Supports PPP/HDLC, Cisco/HDLC and FrameRelay protocol in synchronous mode,
* and asyncronous channels with full modem control.
diff --git a/sys/dev/cp/ng_cp.h b/sys/dev/cp/ng_cp.h
index 0dd65618cce3..f35d81760499 100644
--- a/sys/dev/cp/ng_cp.h
+++ b/sys/dev/cp/ng_cp.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Defines for Cronyx-Tau-PCI adapter driver.
*
* Copyright (C) 1999-2004 Cronyx Engineering.
diff --git a/sys/dev/cs/if_cs.c b/sys/dev/cs/if_cs.c
index 939c2080c815..a8f058068f53 100644
--- a/sys/dev/cs/if_cs.c
+++ b/sys/dev/cs/if_cs.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997,1998 Maxim Bolotin and Oleg Sharoiko.
* All rights reserved.
*
diff --git a/sys/dev/cs/if_cs_isa.c b/sys/dev/cs/if_cs_isa.c
index dcbd02f06869..8064f4b3a7a4 100644
--- a/sys/dev/cs/if_cs_isa.c
+++ b/sys/dev/cs/if_cs_isa.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997,1998 Maxim Bolotin and Oleg Sharoiko.
* All rights reserved.
*
diff --git a/sys/dev/cs/if_cs_pccard.c b/sys/dev/cs/if_cs_pccard.c
index 721a49a9de91..dbd3e54aad14 100644
--- a/sys/dev/cs/if_cs_pccard.c
+++ b/sys/dev/cs/if_cs_pccard.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 M. Warner Losh <imp@village.org>
* All rights reserved.
*
diff --git a/sys/dev/cs/if_csreg.h b/sys/dev/cs/if_csreg.h
index 5a93643591d5..dc844c8cc810 100644
--- a/sys/dev/cs/if_csreg.h
+++ b/sys/dev/cs/if_csreg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997,1998 Maxim Bolotin and Oleg Sharoiko.
* All rights reserved.
*
diff --git a/sys/dev/cs/if_csvar.h b/sys/dev/cs/if_csvar.h
index 0f62c62d934d..0222841fcf08 100644
--- a/sys/dev/cs/if_csvar.h
+++ b/sys/dev/cs/if_csvar.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 M. Warner Losh <imp@village.org>
* All rights reserved.
*
diff --git a/sys/dev/ct/bshw_machdep.c b/sys/dev/ct/bshw_machdep.c
index 5528f439f1ce..0e48f77ad286 100644
--- a/sys/dev/ct/bshw_machdep.c
+++ b/sys/dev/ct/bshw_machdep.c
@@ -4,7 +4,7 @@
__FBSDID("$FreeBSD$");
/* $NetBSD$ */
-/*
+/*-
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
* NetBSD/pc98 porting staff. All rights reserved.
diff --git a/sys/dev/ct/bshwvar.h b/sys/dev/ct/bshwvar.h
index 9e2259c94c76..ba42a7206979 100644
--- a/sys/dev/ct/bshwvar.h
+++ b/sys/dev/ct/bshwvar.h
@@ -2,7 +2,7 @@
/* $NecBSD: bshwvar.h,v 1.3.14.3 2001/06/21 04:07:37 honda Exp $ */
/* $NetBSD$ */
-/*
+/*-
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1994, 1995, 1996, 1997, 1998
* NetBSD/pc98 porting staff. All rights reserved.
diff --git a/sys/dev/ct/ct.c b/sys/dev/ct/ct.c
index eb87dbfb7e55..602e094509ca 100644
--- a/sys/dev/ct/ct.c
+++ b/sys/dev/ct/ct.c
@@ -7,7 +7,7 @@ __FBSDID("$FreeBSD$");
#define CT_DEBUG
#define CT_IO_CONTROL_FLAGS (CT_USE_CCSEQ | CT_FAST_INTR)
-/*
+/*-
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
* NetBSD/pc98 porting staff. All rights reserved.
diff --git a/sys/dev/ct/ct_isa.c b/sys/dev/ct/ct_isa.c
index 15173e23a550..b16b1d872f0e 100644
--- a/sys/dev/ct/ct_isa.c
+++ b/sys/dev/ct/ct_isa.c
@@ -4,7 +4,7 @@
__FBSDID("$FreeBSD$");
/* $NetBSD$ */
-/*
+/*-
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1995, 1996, 1997, 1998
* NetBSD/pc98 porting staff. All rights reserved.
diff --git a/sys/dev/ct/ct_machdep.h b/sys/dev/ct/ct_machdep.h
index 18a9ec86673c..2e069f5d33a1 100644
--- a/sys/dev/ct/ct_machdep.h
+++ b/sys/dev/ct/ct_machdep.h
@@ -2,7 +2,7 @@
/* $NecBSD: ct_machdep.h,v 1.4.12.2 2001/06/20 06:13:34 honda Exp $ */
/* $NetBSD$ */
-/*
+/*-
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1995, 1996, 1997, 1998, 1999, 2000, 2001
* NetBSD/pc98 porting staff. All rights reserved.
diff --git a/sys/dev/ct/ctvar.h b/sys/dev/ct/ctvar.h
index 4e7ba1569edc..8c63445e0200 100644
--- a/sys/dev/ct/ctvar.h
+++ b/sys/dev/ct/ctvar.h
@@ -2,7 +2,7 @@
/* $NecBSD: ctvar.h,v 1.4.14.3 2001/06/20 06:13:34 honda Exp $ */
/* $NetBSD$ */
-/*
+/*-
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1995, 1996, 1997, 1998, 1999, 2000, 2001
* NetBSD/pc98 porting staff. All rights reserved.
diff --git a/sys/dev/ctau/am8530.h b/sys/dev/ctau/am8530.h
index 0ab2d4eaeb45..09831c624ed7 100644
--- a/sys/dev/ctau/am8530.h
+++ b/sys/dev/ctau/am8530.h
@@ -1,4 +1,4 @@
-/*
+/*-
* AMD Am83C30 serial communication controller registers.
*
* Copyright (C) 1996 Cronyx Engineering.
diff --git a/sys/dev/ctau/ctau.c b/sys/dev/ctau/ctau.c
index 37cbd4698caa..9b4f40475af3 100644
--- a/sys/dev/ctau/ctau.c
+++ b/sys/dev/ctau/ctau.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Low-level subroutines for Cronyx-Tau adapter.
*
* Copyright (C) 1994-2001 Cronyx Engineering.
diff --git a/sys/dev/ctau/ctaureg.h b/sys/dev/ctau/ctaureg.h
index 9097a5522a1e..3cd2ce21cedd 100644
--- a/sys/dev/ctau/ctaureg.h
+++ b/sys/dev/ctau/ctaureg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Defines for Cronyx-Tau adapter, based on Hitachi HD64570 controller.
*
* Copyright (C) 1996 Cronyx Engineering.
diff --git a/sys/dev/ctau/ctddk.c b/sys/dev/ctau/ctddk.c
index 92f98056697f..0a9dbd2fd46b 100644
--- a/sys/dev/ctau/ctddk.c
+++ b/sys/dev/ctau/ctddk.c
@@ -1,4 +1,4 @@
-/*
+/*-
* DDK library for Cronyx-Tau adapters.
*
* Copyright (C) 1998-1999 Cronyx Engineering.
diff --git a/sys/dev/ctau/ctddk.h b/sys/dev/ctau/ctddk.h
index d48e1092319a..99620902fc96 100644
--- a/sys/dev/ctau/ctddk.h
+++ b/sys/dev/ctau/ctddk.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Defines for Cronyx-Tau adapter driver.
*
* Copyright (C) 1994-2003 Cronyx Engineering.
diff --git a/sys/dev/ctau/ds2153.h b/sys/dev/ctau/ds2153.h
index bb0241464a55..44ab02d41fe9 100644
--- a/sys/dev/ctau/ds2153.h
+++ b/sys/dev/ctau/ds2153.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Dallas DS2153, DS21x54 single-chip E1 tranceiver registers.
*
* Copyright (C) 1996 Cronyx Engineering.
diff --git a/sys/dev/ctau/hdc64570.h b/sys/dev/ctau/hdc64570.h
index 978ff6ab20c5..29d28cddb04c 100644
--- a/sys/dev/ctau/hdc64570.h
+++ b/sys/dev/ctau/hdc64570.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Hitachi HD64570 serial communications adaptor registers.
*
* Copyright (C) 1996 Cronyx Engineering.
diff --git a/sys/dev/ctau/if_ct.c b/sys/dev/ctau/if_ct.c
index 767972f32a23..09a2ec29f5ed 100644
--- a/sys/dev/ctau/if_ct.c
+++ b/sys/dev/ctau/if_ct.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Cronyx-Tau adapter driver for FreeBSD.
* Supports PPP/HDLC and Cisco/HDLC protocol in synchronous mode,
* and asyncronous channels with full modem control.
diff --git a/sys/dev/ctau/lxt318.h b/sys/dev/ctau/lxt318.h
index f194b7bda03b..a1064afca67c 100644
--- a/sys/dev/ctau/lxt318.h
+++ b/sys/dev/ctau/lxt318.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Level One LXT318 E1 transceiver registers.
* Crystal CS61318 E1 Line Interface Unit registers.
* Crystal CS61581 T1/E1 Line Interface Unit registers.
diff --git a/sys/dev/ctau/ng_ct.h b/sys/dev/ctau/ng_ct.h
index 5fba87812cda..bd4d208e1204 100644
--- a/sys/dev/ctau/ng_ct.h
+++ b/sys/dev/ctau/ng_ct.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Defines for Cronyx-Tau adapter driver.
*
* Copyright (C) 1999-2004 Cronyx Engineering.
diff --git a/sys/dev/cx/cronyxfw.h b/sys/dev/cx/cronyxfw.h
index 70264136ec14..56b2033b09ab 100644
--- a/sys/dev/cx/cronyxfw.h
+++ b/sys/dev/cx/cronyxfw.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Cronyx firmware definitions.
*
* Copyright (C) 1996 Cronyx Engineering.
diff --git a/sys/dev/cx/csigma.c b/sys/dev/cx/csigma.c
index db2c1380c264..e880b88cbef0 100644
--- a/sys/dev/cx/csigma.c
+++ b/sys/dev/cx/csigma.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Low-level subroutines for Cronyx-Sigma adapter.
*
* Copyright (C) 1994-2000 Cronyx Engineering.
diff --git a/sys/dev/cx/cxddk.c b/sys/dev/cx/cxddk.c
index e4328b59b127..bbcc904051e8 100644
--- a/sys/dev/cx/cxddk.c
+++ b/sys/dev/cx/cxddk.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Cronyx-Sigma Driver Development Kit.
*
* Copyright (C) 1998 Cronyx Engineering.
diff --git a/sys/dev/cx/cxddk.h b/sys/dev/cx/cxddk.h
index 75b40c04884d..bd95aa6e254c 100644
--- a/sys/dev/cx/cxddk.h
+++ b/sys/dev/cx/cxddk.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Defines for Cronyx-Sigma adapter driver.
*
* Copyright (C) 1994-2001 Cronyx Engineering.
diff --git a/sys/dev/cx/cxreg.h b/sys/dev/cx/cxreg.h
index 0cfc6b0f101a..70a937d11280 100644
--- a/sys/dev/cx/cxreg.h
+++ b/sys/dev/cx/cxreg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Defines for Cronyx-Sigma adapter, based on Cirrus Logic multiprotocol
* controller RISC processor CL-CD2400/2401.
*
diff --git a/sys/dev/cx/if_cx.c b/sys/dev/cx/if_cx.c
index 4ab00631367e..b705001db51d 100644
--- a/sys/dev/cx/if_cx.c
+++ b/sys/dev/cx/if_cx.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Cronyx-Sigma adapter driver for FreeBSD.
* Supports PPP/HDLC and Cisco/HDLC protocol in synchronous mode,
* and asyncronous channels with full modem control.
diff --git a/sys/dev/cx/machdep.h b/sys/dev/cx/machdep.h
index 23469259bd15..d00f3a90bb45 100644
--- a/sys/dev/cx/machdep.h
+++ b/sys/dev/cx/machdep.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Cronyx DDK: platform dependent definitions.
*
* Copyright (C) 1998-1999 Cronyx Engineering
diff --git a/sys/dev/cx/ng_cx.h b/sys/dev/cx/ng_cx.h
index a878e9872dfa..30b3c14daa4e 100644
--- a/sys/dev/cx/ng_cx.h
+++ b/sys/dev/cx/ng_cx.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Defines for Cronyx-Tau adapter driver.
*
* Copyright (C) 1999-2004 Cronyx Engineering.
diff --git a/sys/dev/cy/cy_pci.c b/sys/dev/cy/cy_pci.c
index 98c21973b3a2..dd119e9145a2 100644
--- a/sys/dev/cy/cy_pci.c
+++ b/sys/dev/cy/cy_pci.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1996, David Greenman
* All rights reserved.
*
diff --git a/sys/dev/dcons/dcons.c b/sys/dev/dcons/dcons.c
index bc33dbe489e2..1adf5f374652 100644
--- a/sys/dev/dcons/dcons.c
+++ b/sys/dev/dcons/dcons.c
@@ -1,5 +1,5 @@
-/*
- * Copyright (C) 2003
+/*-
+ * Copyright (C) 2003,2004
* Hidetoshi Shimokawa. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/dcons/dcons.h b/sys/dev/dcons/dcons.h
index 6c25ee13a625..311453bb744f 100644
--- a/sys/dev/dcons/dcons.h
+++ b/sys/dev/dcons/dcons.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (C) 2002
+/*-
+ * Copyright (C) 2002-2004
* Hidetoshi Shimokawa. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/dcons/dcons_crom.c b/sys/dev/dcons/dcons_crom.c
index f2518fd52c11..85c98fc528ba 100644
--- a/sys/dev/dcons/dcons_crom.c
+++ b/sys/dev/dcons/dcons_crom.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (C) 2003
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/dec/mc146818reg.h b/sys/dev/dec/mc146818reg.h
index e60d043f13dd..4a3df1c117b0 100644
--- a/sys/dev/dec/mc146818reg.h
+++ b/sys/dev/dec/mc146818reg.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* $NetBSD: mc146818reg.h,v 1.2 1997/03/12 06:53:42 cgd Exp $ */
-/*
+/*-
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/dev/dec/mcclock.c b/sys/dev/dec/mcclock.c
index 5c1472cb1975..da8664e007af 100644
--- a/sys/dev/dec/mcclock.c
+++ b/sys/dev/dec/mcclock.c
@@ -3,7 +3,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-/*
+/*-
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/dev/dec/mcclock_if.m b/sys/dev/dec/mcclock_if.m
index a67caca2604e..89bc6c481194 100644
--- a/sys/dev/dec/mcclock_if.m
+++ b/sys/dev/dec/mcclock_if.m
@@ -1,4 +1,4 @@
-#
+#-
# Copyright (c) 1998 Doug Rabson
# All rights reserved.
#
diff --git a/sys/dev/dec/mcclockvar.h b/sys/dev/dec/mcclockvar.h
index 196209be3bce..b0df9d2eff2c 100644
--- a/sys/dev/dec/mcclockvar.h
+++ b/sys/dev/dec/mcclockvar.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* $NetBSD: mcclockvar.h,v 1.4 1997/06/22 08:02:19 jonathan Exp $ */
-/*
+/*-
* Copyright (c) 1996 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/dev/dpt/dpt.h b/sys/dev/dpt/dpt.h
index d04c95a3b8bb..39171950f414 100644
--- a/sys/dev/dpt/dpt.h
+++ b/sys/dev/dpt/dpt.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997 by Simon Shapiro
* All Rights Reserved
*
diff --git a/sys/dev/dpt/dpt_scsi.c b/sys/dev/dpt/dpt_scsi.c
index 59256872916f..db2f7b06603c 100644
--- a/sys/dev/dpt/dpt_scsi.c
+++ b/sys/dev/dpt/dpt_scsi.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997 by Simon Shapiro
* All Rights Reserved
*
diff --git a/sys/dev/drm/ati_pcigart.h b/sys/dev/drm/ati_pcigart.h
index dd1141f5303a..0bdb3363313b 100644
--- a/sys/dev/drm/ati_pcigart.h
+++ b/sys/dev/drm/ati_pcigart.h
@@ -1,6 +1,6 @@
/* ati_pcigart.h -- ATI PCI GART support -*- linux-c -*-
- * Created: Wed Dec 13 21:52:19 2000 by gareth@valinux.com
- *
+ * Created: Wed Dec 13 21:52:19 2000 by gareth@valinux.com */
+/*-
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All Rights Reserved.
*
diff --git a/sys/dev/drm/drm.h b/sys/dev/drm/drm.h
index 36e86b364e1a..167578308eb3 100644
--- a/sys/dev/drm/drm.h
+++ b/sys/dev/drm/drm.h
@@ -8,7 +8,7 @@
* Dec 1999, Richard Henderson <rth@twiddle.net>, move to generic \c cmpxchg.
*/
-/*
+/*-
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All rights reserved.
diff --git a/sys/dev/drm/drmP.h b/sys/dev/drm/drmP.h
index e45bad4fda9a..c30ab875a8b8 100644
--- a/sys/dev/drm/drmP.h
+++ b/sys/dev/drm/drmP.h
@@ -1,6 +1,6 @@
/* drmP.h -- Private header for Direct Rendering Manager -*- linux-c -*-
- * Created: Mon Jan 4 10:05:05 1999 by faith@precisioninsight.com
- *
+ * Created: Mon Jan 4 10:05:05 1999 by faith@precisioninsight.com */
+/*-
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All rights reserved.
diff --git a/sys/dev/drm/drm_agpsupport.h b/sys/dev/drm/drm_agpsupport.h
index fc2f4d1e5663..4758a88e9d3c 100644
--- a/sys/dev/drm/drm_agpsupport.h
+++ b/sys/dev/drm/drm_agpsupport.h
@@ -1,6 +1,6 @@
/* drm_agpsupport.h -- DRM support for AGP/GART backend -*- linux-c -*-
- * Created: Mon Dec 13 09:56:45 1999 by faith@precisioninsight.com
- *
+ * Created: Mon Dec 13 09:56:45 1999 by faith@precisioninsight.com */
+/*-
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All Rights Reserved.
diff --git a/sys/dev/drm/drm_auth.h b/sys/dev/drm/drm_auth.h
index 9141d5778b06..faa3ffcb0234 100644
--- a/sys/dev/drm/drm_auth.h
+++ b/sys/dev/drm/drm_auth.h
@@ -1,6 +1,6 @@
/* drm_auth.h -- IOCTLs for authentication -*- linux-c -*-
- * Created: Tue Feb 2 08:37:54 1999 by faith@valinux.com
- *
+ * Created: Tue Feb 2 08:37:54 1999 by faith@valinux.com */
+/*-
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All Rights Reserved.
diff --git a/sys/dev/drm/drm_bufs.h b/sys/dev/drm/drm_bufs.h
index 8b40f9847430..841fb1360da0 100644
--- a/sys/dev/drm/drm_bufs.h
+++ b/sys/dev/drm/drm_bufs.h
@@ -1,6 +1,6 @@
/* drm_bufs.h -- Generic buffer template -*- linux-c -*-
- * Created: Thu Nov 23 03:10:50 2000 by gareth@valinux.com
- *
+ * Created: Thu Nov 23 03:10:50 2000 by gareth@valinux.com */
+/*-
* Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All Rights Reserved.
diff --git a/sys/dev/drm/drm_context.h b/sys/dev/drm/drm_context.h
index 9d832641fb7d..177bd5967399 100644
--- a/sys/dev/drm/drm_context.h
+++ b/sys/dev/drm/drm_context.h
@@ -1,6 +1,6 @@
/* drm_context.h -- IOCTLs for generic contexts -*- linux-c -*-
- * Created: Fri Nov 24 18:31:37 2000 by gareth@valinux.com
- *
+ * Created: Fri Nov 24 18:31:37 2000 by gareth@valinux.com */
+/*-
* Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All Rights Reserved.
diff --git a/sys/dev/drm/drm_dma.h b/sys/dev/drm/drm_dma.h
index 7cf3d174653d..9a0f2aa27062 100644
--- a/sys/dev/drm/drm_dma.h
+++ b/sys/dev/drm/drm_dma.h
@@ -1,6 +1,6 @@
/* drm_dma.c -- DMA IOCTL and function support -*- linux-c -*-
- * Created: Fri Mar 19 14:30:16 1999 by faith@valinux.com
- *
+ * Created: Fri Mar 19 14:30:16 1999 by faith@valinux.com */
+/*-
* Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All Rights Reserved.
diff --git a/sys/dev/drm/drm_drawable.h b/sys/dev/drm/drm_drawable.h
index 7f3938d62090..d7381f17b110 100644
--- a/sys/dev/drm/drm_drawable.h
+++ b/sys/dev/drm/drm_drawable.h
@@ -1,6 +1,6 @@
/* drm_drawable.h -- IOCTLs for drawables -*- linux-c -*-
- * Created: Tue Feb 2 08:37:54 1999 by faith@valinux.com
- *
+ * Created: Tue Feb 2 08:37:54 1999 by faith@valinux.com */
+/*-
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All Rights Reserved.
diff --git a/sys/dev/drm/drm_drv.h b/sys/dev/drm/drm_drv.h
index 1227296eb6ac..59bf0c83dc6c 100644
--- a/sys/dev/drm/drm_drv.h
+++ b/sys/dev/drm/drm_drv.h
@@ -1,6 +1,6 @@
/* drm_drv.h -- Generic driver template -*- linux-c -*-
- * Created: Thu Nov 23 03:10:50 2000 by gareth@valinux.com
- *
+ * Created: Thu Nov 23 03:10:50 2000 by gareth@valinux.com */
+/*-
* Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All Rights Reserved.
diff --git a/sys/dev/drm/drm_fops.h b/sys/dev/drm/drm_fops.h
index 4c79fe117237..0e4b24c97297 100644
--- a/sys/dev/drm/drm_fops.h
+++ b/sys/dev/drm/drm_fops.h
@@ -1,6 +1,6 @@
/* drm_fops.h -- File operations for DRM -*- linux-c -*-
- * Created: Mon Jan 4 08:58:31 1999 by faith@valinux.com
- *
+ * Created: Mon Jan 4 08:58:31 1999 by faith@valinux.com */
+/*-
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All Rights Reserved.
diff --git a/sys/dev/drm/drm_ioctl.h b/sys/dev/drm/drm_ioctl.h
index d34851937721..e04e47bd0609 100644
--- a/sys/dev/drm/drm_ioctl.h
+++ b/sys/dev/drm/drm_ioctl.h
@@ -1,6 +1,6 @@
/* drm_ioctl.h -- IOCTL processing for DRM -*- linux-c -*-
- * Created: Fri Jan 8 09:01:26 1999 by faith@valinux.com
- *
+ * Created: Fri Jan 8 09:01:26 1999 by faith@valinux.com */
+/*-
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All Rights Reserved.
diff --git a/sys/dev/drm/drm_irq.h b/sys/dev/drm/drm_irq.h
index 8f7d747f4799..89f5cda6b745 100644
--- a/sys/dev/drm/drm_irq.h
+++ b/sys/dev/drm/drm_irq.h
@@ -1,6 +1,6 @@
/* drm_dma.c -- DMA IOCTL and function support
- * Created: Fri Oct 18 2003 by anholt@FreeBSD.org
- *
+ * Created: Fri Oct 18 2003 by anholt@FreeBSD.org */
+/*-
* Copyright 2003 Eric Anholt
* All Rights Reserved.
*
diff --git a/sys/dev/drm/drm_linux_list.h b/sys/dev/drm/drm_linux_list.h
index 4fef61c528b6..12de8233f150 100644
--- a/sys/dev/drm/drm_linux_list.h
+++ b/sys/dev/drm/drm_linux_list.h
@@ -1,6 +1,6 @@
/* drm_linux_list.h -- linux list functions for the BSDs.
- * Created: Mon Apr 7 14:30:16 1999 by anholt@FreeBSD.org
- *
+ * Created: Mon Apr 7 14:30:16 1999 by anholt@FreeBSD.org */
+/*-
* Copyright 2003 Eric Anholt
* All Rights Reserved.
*
diff --git a/sys/dev/drm/drm_lock.h b/sys/dev/drm/drm_lock.h
index f0937076e552..bcdcbfe3dc05 100644
--- a/sys/dev/drm/drm_lock.h
+++ b/sys/dev/drm/drm_lock.h
@@ -1,6 +1,6 @@
/* lock.c -- IOCTLs for locking -*- linux-c -*-
- * Created: Tue Feb 2 08:37:54 1999 by faith@valinux.com
- *
+ * Created: Tue Feb 2 08:37:54 1999 by faith@valinux.com */
+/*-
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All Rights Reserved.
diff --git a/sys/dev/drm/drm_memory.h b/sys/dev/drm/drm_memory.h
index 917cb1e15e7a..1bf0e8e1470f 100644
--- a/sys/dev/drm/drm_memory.h
+++ b/sys/dev/drm/drm_memory.h
@@ -1,6 +1,6 @@
/* drm_memory.h -- Memory management wrappers for DRM -*- linux-c -*-
- * Created: Thu Feb 4 14:00:34 1999 by faith@valinux.com
- *
+ * Created: Thu Feb 4 14:00:34 1999 by faith@valinux.com */
+/*-
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All Rights Reserved.
diff --git a/sys/dev/drm/drm_memory_debug.h b/sys/dev/drm/drm_memory_debug.h
index a627fb4281de..1ce7ffe403c6 100644
--- a/sys/dev/drm/drm_memory_debug.h
+++ b/sys/dev/drm/drm_memory_debug.h
@@ -1,6 +1,6 @@
/* drm_memory.h -- Memory management wrappers for DRM -*- linux-c -*-
- * Created: Thu Feb 4 14:00:34 1999 by faith@valinux.com
- *
+ * Created: Thu Feb 4 14:00:34 1999 by faith@valinux.com */
+/*-
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All Rights Reserved.
diff --git a/sys/dev/drm/drm_os_freebsd.h b/sys/dev/drm/drm_os_freebsd.h
index 95082e6a5bcf..dc7732caaf0d 100644
--- a/sys/dev/drm/drm_os_freebsd.h
+++ b/sys/dev/drm/drm_os_freebsd.h
@@ -5,7 +5,7 @@
* \author Eric Anholt <anholt@FreeBSD.org>
*/
-/*
+/*-
* Copyright 2003 Eric Anholt
* All Rights Reserved.
*
diff --git a/sys/dev/drm/drm_pci.h b/sys/dev/drm/drm_pci.h
index 2a0569d06d0c..12add61778e5 100644
--- a/sys/dev/drm/drm_pci.h
+++ b/sys/dev/drm/drm_pci.h
@@ -5,7 +5,7 @@
* \author Eric Anholt <anholt@FreeBSD.org>
*/
-/*
+/*-
* Copyright 2003 Eric Anholt.
* All Rights Reserved.
*
diff --git a/sys/dev/drm/drm_sarea.h b/sys/dev/drm/drm_sarea.h
index 45bef824e7cc..cee32192f0b3 100644
--- a/sys/dev/drm/drm_sarea.h
+++ b/sys/dev/drm/drm_sarea.h
@@ -5,7 +5,7 @@
* \author Michel D�zer <michel@daenzer.net>
*/
-/*
+/*-
* Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
* All Rights Reserved.
*
diff --git a/sys/dev/drm/drm_scatter.h b/sys/dev/drm/drm_scatter.h
index 4da0a1b6f1ca..a67f1c62d95c 100644
--- a/sys/dev/drm/drm_scatter.h
+++ b/sys/dev/drm/drm_scatter.h
@@ -1,6 +1,6 @@
/* drm_scatter.h -- IOCTLs to manage scatter/gather memory -*- linux-c -*-
- * Created: Mon Dec 18 23:20:54 2000 by gareth@valinux.com
- *
+ * Created: Mon Dec 18 23:20:54 2000 by gareth@valinux.com */
+/*-
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All Rights Reserved.
*
diff --git a/sys/dev/drm/drm_sysctl.h b/sys/dev/drm/drm_sysctl.h
index a1ab8635125f..c558f767159c 100644
--- a/sys/dev/drm/drm_sysctl.h
+++ b/sys/dev/drm/drm_sysctl.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright 2003 Eric Anholt
* All Rights Reserved.
*
diff --git a/sys/dev/drm/drm_vm.h b/sys/dev/drm/drm_vm.h
index 2637a83998ed..23a6de74a47a 100644
--- a/sys/dev/drm/drm_vm.h
+++ b/sys/dev/drm/drm_vm.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright 2003 Eric Anholt
* All Rights Reserved.
*
diff --git a/sys/dev/drm/mga.h b/sys/dev/drm/mga.h
index 74a98ac40ef4..6f463c31c8b4 100644
--- a/sys/dev/drm/mga.h
+++ b/sys/dev/drm/mga.h
@@ -1,6 +1,6 @@
/* mga.h -- Matrox G200/G400 DRM template customization -*- linux-c -*-
- * Created: Thu Jan 11 21:29:32 2001 by gareth@valinux.com
- *
+ * Created: Thu Jan 11 21:29:32 2001 by gareth@valinux.com */
+/*-
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All Rights Reserved.
*
diff --git a/sys/dev/drm/mga_dma.c b/sys/dev/drm/mga_dma.c
index 3f75d7663f2a..57db72d6dad6 100644
--- a/sys/dev/drm/mga_dma.c
+++ b/sys/dev/drm/mga_dma.c
@@ -1,6 +1,6 @@
/* mga_dma.c -- DMA support for mga g200/g400 -*- linux-c -*-
- * Created: Mon Dec 13 01:50:01 1999 by jhartmann@precisioninsight.com
- *
+ * Created: Mon Dec 13 01:50:01 1999 by jhartmann@precisioninsight.com */
+/*-
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All Rights Reserved.
diff --git a/sys/dev/drm/mga_drm.h b/sys/dev/drm/mga_drm.h
index 57ecc16c5719..fb851a9890bc 100644
--- a/sys/dev/drm/mga_drm.h
+++ b/sys/dev/drm/mga_drm.h
@@ -1,6 +1,6 @@
/* mga_drm.h -- Public header for the Matrox g200/g400 driver -*- linux-c -*-
- * Created: Tue Jan 25 01:50:01 1999 by jhartmann@precisioninsight.com
- *
+ * Created: Tue Jan 25 01:50:01 1999 by jhartmann@precisioninsight.com */
+/*-
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All rights reserved.
diff --git a/sys/dev/drm/mga_drv.c b/sys/dev/drm/mga_drv.c
index cbec2999beb5..6de110a04e98 100644
--- a/sys/dev/drm/mga_drv.c
+++ b/sys/dev/drm/mga_drv.c
@@ -1,6 +1,6 @@
/* mga_drv.c -- Matrox G200/G400 driver -*- linux-c -*-
- * Created: Mon Dec 13 01:56:22 1999 by jhartmann@precisioninsight.com
- *
+ * Created: Mon Dec 13 01:56:22 1999 by jhartmann@precisioninsight.com */
+/*-
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All Rights Reserved.
diff --git a/sys/dev/drm/mga_drv.h b/sys/dev/drm/mga_drv.h
index c84c9ea5b963..b4f333a6c09d 100644
--- a/sys/dev/drm/mga_drv.h
+++ b/sys/dev/drm/mga_drv.h
@@ -1,6 +1,6 @@
/* mga_drv.h -- Private header for the Matrox G200/G400 driver -*- linux-c -*-
- * Created: Mon Dec 13 01:50:01 1999 by jhartmann@precisioninsight.com
- *
+ * Created: Mon Dec 13 01:50:01 1999 by jhartmann@precisioninsight.com */
+/*-
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All rights reserved.
diff --git a/sys/dev/drm/mga_irq.c b/sys/dev/drm/mga_irq.c
index 1c9a93f5940a..82a2705add19 100644
--- a/sys/dev/drm/mga_irq.c
+++ b/sys/dev/drm/mga_irq.c
@@ -1,5 +1,5 @@
-/* mga_irq.c -- IRQ handling for radeon -*- linux-c -*-
- *
+/* mga_irq.c -- IRQ handling for radeon -*- linux-c -*- */
+/*-
* Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved.
*
* The Weather Channel (TM) funded Tungsten Graphics to develop the
diff --git a/sys/dev/drm/mga_state.c b/sys/dev/drm/mga_state.c
index b4a7d6f07d9f..8e72f2200f67 100644
--- a/sys/dev/drm/mga_state.c
+++ b/sys/dev/drm/mga_state.c
@@ -1,6 +1,6 @@
/* mga_state.c -- State support for MGA G200/G400 -*- linux-c -*-
- * Created: Thu Jan 27 02:53:43 2000 by jhartmann@precisioninsight.com
- *
+ * Created: Thu Jan 27 02:53:43 2000 by jhartmann@precisioninsight.com */
+/*-
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All Rights Reserved.
diff --git a/sys/dev/drm/mga_ucode.h b/sys/dev/drm/mga_ucode.h
index 3dd85e3bea2f..575166e96d24 100644
--- a/sys/dev/drm/mga_ucode.h
+++ b/sys/dev/drm/mga_ucode.h
@@ -1,6 +1,6 @@
/* mga_ucode.h -- Matrox G200/G400 WARP engine microcode -*- linux-c -*-
- * Created: Thu Jan 11 21:20:43 2001 by gareth@valinux.com
- *
+ * Created: Thu Jan 11 21:20:43 2001 by gareth@valinux.com */
+/*-
* Copyright 1999 Matrox Graphics Inc.
* All Rights Reserved.
*
diff --git a/sys/dev/drm/mga_warp.c b/sys/dev/drm/mga_warp.c
index 035d04589add..db292dd69bdd 100644
--- a/sys/dev/drm/mga_warp.c
+++ b/sys/dev/drm/mga_warp.c
@@ -1,6 +1,6 @@
/* mga_warp.c -- Matrox G200/G400 WARP engine management -*- linux-c -*-
- * Created: Thu Jan 11 21:29:32 2001 by gareth@valinux.com
- *
+ * Created: Thu Jan 11 21:29:32 2001 by gareth@valinux.com */
+/*-
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All Rights Reserved.
*
diff --git a/sys/dev/drm/r128.h b/sys/dev/drm/r128.h
index 3a22671f3724..0b0fc928b181 100644
--- a/sys/dev/drm/r128.h
+++ b/sys/dev/drm/r128.h
@@ -1,6 +1,6 @@
/* r128.h -- ATI Rage 128 DRM template customization -*- linux-c -*-
- * Created: Wed Feb 14 16:07:10 2001 by gareth@valinux.com
- *
+ * Created: Wed Feb 14 16:07:10 2001 by gareth@valinux.com */
+/*-
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All Rights Reserved.
*
diff --git a/sys/dev/drm/r128_cce.c b/sys/dev/drm/r128_cce.c
index e7160bd9a5da..75a3c3015337 100644
--- a/sys/dev/drm/r128_cce.c
+++ b/sys/dev/drm/r128_cce.c
@@ -1,6 +1,6 @@
/* r128_cce.c -- ATI Rage 128 driver -*- linux-c -*-
- * Created: Wed Apr 5 19:24:19 2000 by kevin@precisioninsight.com
- *
+ * Created: Wed Apr 5 19:24:19 2000 by kevin@precisioninsight.com */
+/*-
* Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All Rights Reserved.
diff --git a/sys/dev/drm/r128_drm.h b/sys/dev/drm/r128_drm.h
index 30b8b3eaf548..32a58daa13b0 100644
--- a/sys/dev/drm/r128_drm.h
+++ b/sys/dev/drm/r128_drm.h
@@ -1,6 +1,6 @@
/* r128_drm.h -- Public header for the r128 driver -*- linux-c -*-
- * Created: Wed Apr 5 19:24:19 2000 by kevin@precisioninsight.com
- *
+ * Created: Wed Apr 5 19:24:19 2000 by kevin@precisioninsight.com */
+/*-
* Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All rights reserved.
diff --git a/sys/dev/drm/r128_drv.c b/sys/dev/drm/r128_drv.c
index b9df5ecf9708..16035fccd747 100644
--- a/sys/dev/drm/r128_drv.c
+++ b/sys/dev/drm/r128_drv.c
@@ -1,6 +1,6 @@
/* r128_drv.c -- ATI Rage 128 driver -*- linux-c -*-
- * Created: Mon Dec 13 09:47:27 1999 by faith@precisioninsight.com
- *
+ * Created: Mon Dec 13 09:47:27 1999 by faith@precisioninsight.com */
+/*-
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All Rights Reserved.
diff --git a/sys/dev/drm/r128_drv.h b/sys/dev/drm/r128_drv.h
index 0695684c1db2..8d8f87794330 100644
--- a/sys/dev/drm/r128_drv.h
+++ b/sys/dev/drm/r128_drv.h
@@ -1,6 +1,6 @@
/* r128_drv.h -- Private header for r128 driver -*- linux-c -*-
- * Created: Mon Dec 13 09:51:11 1999 by faith@precisioninsight.com
- *
+ * Created: Mon Dec 13 09:51:11 1999 by faith@precisioninsight.com */
+/*-
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All rights reserved.
diff --git a/sys/dev/drm/r128_irq.c b/sys/dev/drm/r128_irq.c
index 2da58d61b4bf..fa3fb43f3cfe 100644
--- a/sys/dev/drm/r128_irq.c
+++ b/sys/dev/drm/r128_irq.c
@@ -1,5 +1,5 @@
-/* r128_irq.c -- IRQ handling for radeon -*- linux-c -*-
- *
+/* r128_irq.c -- IRQ handling for radeon -*- linux-c -*- */
+/*-
* Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved.
*
* The Weather Channel (TM) funded Tungsten Graphics to develop the
diff --git a/sys/dev/drm/r128_state.c b/sys/dev/drm/r128_state.c
index 703d5508e42e..5286e29c606f 100644
--- a/sys/dev/drm/r128_state.c
+++ b/sys/dev/drm/r128_state.c
@@ -1,6 +1,6 @@
/* r128_state.c -- State support for r128 -*- linux-c -*-
- * Created: Thu Jan 27 02:53:43 2000 by gareth@valinux.com
- *
+ * Created: Thu Jan 27 02:53:43 2000 by gareth@valinux.com */
+/*-
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All Rights Reserved.
*
diff --git a/sys/dev/drm/radeon.h b/sys/dev/drm/radeon.h
index 517d9d27cccf..f7f9708c07b4 100644
--- a/sys/dev/drm/radeon.h
+++ b/sys/dev/drm/radeon.h
@@ -1,6 +1,6 @@
/* radeon.h -- ATI Radeon DRM template customization -*- linux-c -*-
- * Created: Wed Feb 14 17:07:34 2001 by gareth@valinux.com
- *
+ * Created: Wed Feb 14 17:07:34 2001 by gareth@valinux.com */
+/*-
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All Rights Reserved.
*
diff --git a/sys/dev/drm/radeon_cp.c b/sys/dev/drm/radeon_cp.c
index 59cd9ff58b01..2418f803a871 100644
--- a/sys/dev/drm/radeon_cp.c
+++ b/sys/dev/drm/radeon_cp.c
@@ -1,5 +1,5 @@
-/* radeon_cp.c -- CP support for Radeon -*- linux-c -*-
- *
+/* radeon_cp.c -- CP support for Radeon -*- linux-c -*- */
+/*-
* Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Fremont, California.
* All Rights Reserved.
diff --git a/sys/dev/drm/radeon_drm.h b/sys/dev/drm/radeon_drm.h
index 51bbacfbf424..b0e59aa620a8 100644
--- a/sys/dev/drm/radeon_drm.h
+++ b/sys/dev/drm/radeon_drm.h
@@ -1,5 +1,5 @@
-/* radeon_drm.h -- Public header for the radeon driver -*- linux-c -*-
- *
+/* radeon_drm.h -- Public header for the radeon driver -*- linux-c -*- */
+/*-
* Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Fremont, California.
* Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
diff --git a/sys/dev/drm/radeon_drv.c b/sys/dev/drm/radeon_drv.c
index 354167560863..ca94080d2696 100644
--- a/sys/dev/drm/radeon_drv.c
+++ b/sys/dev/drm/radeon_drv.c
@@ -1,6 +1,6 @@
/* radeon_drv.c -- ATI Radeon driver -*- linux-c -*-
- * Created: Wed Feb 14 17:10:04 2001 by gareth@valinux.com
- *
+ * Created: Wed Feb 14 17:10:04 2001 by gareth@valinux.com */
+/*-
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All Rights Reserved.
*
@@ -58,7 +58,7 @@
#endif
#ifdef __FreeBSD__
-DRIVER_MODULE(DRIVER_NAME, pci, DRM(driver), DRM(devclass), 0, 0);
+DRIVER_MODULE(radeon, pci, DRM(driver), DRM(devclass), 0, 0);
#elif defined(__NetBSD__)
CFDRIVER_DECL(radeon, DV_TTY, NULL);
#endif /* __FreeBSD__ */
diff --git a/sys/dev/drm/radeon_drv.h b/sys/dev/drm/radeon_drv.h
index d14d34204afd..ab694dec9f8a 100644
--- a/sys/dev/drm/radeon_drv.h
+++ b/sys/dev/drm/radeon_drv.h
@@ -1,5 +1,5 @@
-/* radeon_drv.h -- Private header for radeon driver -*- linux-c -*-
- *
+/* radeon_drv.h -- Private header for radeon driver -*- linux-c -*- */
+/*-
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Fremont, California.
* All rights reserved.
diff --git a/sys/dev/drm/radeon_irq.c b/sys/dev/drm/radeon_irq.c
index 636653c2ae1e..2d600a4e51c1 100644
--- a/sys/dev/drm/radeon_irq.c
+++ b/sys/dev/drm/radeon_irq.c
@@ -1,5 +1,5 @@
-/* radeon_irq.c -- IRQ handling for radeon -*- linux-c -*-
- *
+/* radeon_irq.c -- IRQ handling for radeon -*- linux-c -*- */
+/*-
* Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved.
*
* The Weather Channel (TM) funded Tungsten Graphics to develop the
diff --git a/sys/dev/drm/radeon_mem.c b/sys/dev/drm/radeon_mem.c
index 3238c2717a27..472b21f1e92c 100644
--- a/sys/dev/drm/radeon_mem.c
+++ b/sys/dev/drm/radeon_mem.c
@@ -1,5 +1,5 @@
-/* radeon_mem.c -- Simple GART/fb memory manager for radeon -*- linux-c -*-
- *
+/* radeon_mem.c -- Simple GART/fb memory manager for radeon -*- linux-c -*- */
+/*-
* Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved.
*
* The Weather Channel (TM) funded Tungsten Graphics to develop the
diff --git a/sys/dev/drm/radeon_state.c b/sys/dev/drm/radeon_state.c
index 950a8eec2df2..e6caf2f616d5 100644
--- a/sys/dev/drm/radeon_state.c
+++ b/sys/dev/drm/radeon_state.c
@@ -1,5 +1,5 @@
-/* radeon_state.c -- State support for Radeon -*- linux-c -*-
- *
+/* radeon_state.c -- State support for Radeon -*- linux-c -*- */
+/*-
* Copyright 2000 VA Linux Systems, Inc., Fremont, California.
* All Rights Reserved.
*
diff --git a/sys/dev/drm/sis.h b/sys/dev/drm/sis.h
index 03498183f2e7..dde5d9555195 100644
--- a/sys/dev/drm/sis.h
+++ b/sys/dev/drm/sis.h
@@ -1,5 +1,5 @@
-/* sis_drv.h -- Private header for sis driver -*- linux-c -*-
- *
+/* sis_drv.h -- Private header for sis driver -*- linux-c -*- */
+/*-
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All rights reserved.
diff --git a/sys/dev/drm/sis_drv.c b/sys/dev/drm/sis_drv.c
index ae6615b912aa..5009f9d940bf 100644
--- a/sys/dev/drm/sis_drv.c
+++ b/sys/dev/drm/sis_drv.c
@@ -1,5 +1,5 @@
-/* sis.c -- sis driver -*- linux-c -*-
- *
+/* sis.c -- sis driver -*- linux-c -*- */
+/*-
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All Rights Reserved.
diff --git a/sys/dev/drm/sis_drv.h b/sys/dev/drm/sis_drv.h
index 3f80901bb171..156e2b24787e 100644
--- a/sys/dev/drm/sis_drv.h
+++ b/sys/dev/drm/sis_drv.h
@@ -1,5 +1,5 @@
-/* sis_drv.h -- Private header for sis driver -*- linux-c -*-
- *
+/* sis_drv.h -- Private header for sis driver -*- linux-c -*- */
+/*-
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All rights reserved.
diff --git a/sys/dev/drm/sis_ds.c b/sys/dev/drm/sis_ds.c
index 74b111e33750..cf837a7e504c 100644
--- a/sys/dev/drm/sis_ds.c
+++ b/sys/dev/drm/sis_ds.c
@@ -1,6 +1,6 @@
/* sis_ds.c -- Private header for Direct Rendering Manager -*- linux-c -*-
- * Created: Mon Jan 4 10:05:05 1999 by sclin@sis.com.tw
- *
+ * Created: Mon Jan 4 10:05:05 1999 by sclin@sis.com.tw */
+/*-
* Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan.
* All rights reserved.
*
diff --git a/sys/dev/drm/sis_ds.h b/sys/dev/drm/sis_ds.h
index d5cdbc27800a..ce9535bf926d 100644
--- a/sys/dev/drm/sis_ds.h
+++ b/sys/dev/drm/sis_ds.h
@@ -1,6 +1,6 @@
/* sis_ds.h -- Private header for Direct Rendering Manager -*- linux-c -*-
- * Created: Mon Jan 4 10:05:05 1999 by sclin@sis.com.tw
- *
+ * Created: Mon Jan 4 10:05:05 1999 by sclin@sis.com.tw */
+/*-
* Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan.
* All rights reserved.
*
diff --git a/sys/dev/drm/sis_mm.c b/sys/dev/drm/sis_mm.c
index 6f29974ee082..6464c4c3b89b 100644
--- a/sys/dev/drm/sis_mm.c
+++ b/sys/dev/drm/sis_mm.c
@@ -1,6 +1,7 @@
/* sis_mm.c -- Private header for Direct Rendering Manager -*- linux-c -*-
- * Created: Mon Jan 4 10:05:05 1999 by sclin@sis.com.tw
- *
+ * Created: Mon Jan 4 10:05:05 1999 by sclin@sis.com.tw *
+ */
+/*-
* Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan.
* All rights reserved.
*
diff --git a/sys/dev/drm/tdfx.h b/sys/dev/drm/tdfx.h
index cc2b72035c8b..9a8cf720e851 100644
--- a/sys/dev/drm/tdfx.h
+++ b/sys/dev/drm/tdfx.h
@@ -1,6 +1,6 @@
/* tdfx.h -- 3dfx DRM template customization -*- linux-c -*-
- * Created: Wed Feb 14 12:32:32 2001 by gareth@valinux.com
- *
+ * Created: Wed Feb 14 12:32:32 2001 by gareth@valinux.com */
+/*-
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All Rights Reserved.
*
diff --git a/sys/dev/drm/tdfx_drv.c b/sys/dev/drm/tdfx_drv.c
index 93083fdeea23..4985ee05762b 100644
--- a/sys/dev/drm/tdfx_drv.c
+++ b/sys/dev/drm/tdfx_drv.c
@@ -1,6 +1,6 @@
/* tdfx_drv.c -- tdfx driver -*- linux-c -*-
- * Created: Thu Oct 7 10:38:32 1999 by faith@precisioninsight.com
- *
+ * Created: Thu Oct 7 10:38:32 1999 by faith@precisioninsight.com */
+/*-
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* All Rights Reserved.
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 5f441e6a97c2..28fe83779964 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1995, David Greenman
* All rights reserved.
*
diff --git a/sys/dev/ed/if_ed98.h b/sys/dev/ed/if_ed98.h
index 22bbf78be0e6..2a2af0498cca 100644
--- a/sys/dev/ed/if_ed98.h
+++ b/sys/dev/ed/if_ed98.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) KATO Takenori, 1996. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/ed/if_ed_cbus.c b/sys/dev/ed/if_ed_cbus.c
index 0b9a1220b9c7..1f8424355c1f 100644
--- a/sys/dev/ed/if_ed_cbus.c
+++ b/sys/dev/ed/if_ed_cbus.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1995, David Greenman
* All rights reserved.
*
diff --git a/sys/dev/ed/if_ed_isa.c b/sys/dev/ed/if_ed_isa.c
index 69da715f2646..3a5804c8dcdd 100644
--- a/sys/dev/ed/if_ed_isa.c
+++ b/sys/dev/ed/if_ed_isa.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1995, David Greenman
* All rights reserved.
*
diff --git a/sys/dev/ed/if_ed_pccard.c b/sys/dev/ed/if_ed_pccard.c
index fca8bfe21c85..4a0d32caf6a0 100644
--- a/sys/dev/ed/if_ed_pccard.c
+++ b/sys/dev/ed/if_ed_pccard.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1995, David Greenman
* All rights reserved.
*
diff --git a/sys/dev/ed/if_edreg.h b/sys/dev/ed/if_edreg.h
index 4b0857894ce9..cfe5b7053142 100644
--- a/sys/dev/ed/if_edreg.h
+++ b/sys/dev/ed/if_edreg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (C) 1993, David Greenman. This software may be used, modified,
* copied, distributed, and sold, in both source and binary form provided
* that the above copyright and these terms are retained. Under no
diff --git a/sys/dev/ed/if_edvar.h b/sys/dev/ed/if_edvar.h
index fd3bcf1cf169..d8da2fcc816d 100644
--- a/sys/dev/ed/if_edvar.h
+++ b/sys/dev/ed/if_edvar.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1995, David Greenman
* All rights reserved.
*
diff --git a/sys/dev/eisa/eisa_if.m b/sys/dev/eisa/eisa_if.m
index 9bf7e56bb542..72c8184cdce5 100644
--- a/sys/dev/eisa/eisa_if.m
+++ b/sys/dev/eisa/eisa_if.m
@@ -1,4 +1,4 @@
-#
+#-
# Copyright (c) 2004 M. Warner Losh
# All rights reserved.
#
diff --git a/sys/dev/eisa/eisaconf.c b/sys/dev/eisa/eisaconf.c
index 2ef026561aeb..b9c77f5b5c60 100644
--- a/sys/dev/eisa/eisaconf.c
+++ b/sys/dev/eisa/eisaconf.c
@@ -1,4 +1,4 @@
-/*
+/*-
* EISA bus probe and attach routines
*
* Copyright (c) 1995, 1996 Justin T. Gibbs.
diff --git a/sys/dev/eisa/eisaconf.h b/sys/dev/eisa/eisaconf.h
index ebdee5a6cdd6..522cd5db59e1 100644
--- a/sys/dev/eisa/eisaconf.h
+++ b/sys/dev/eisa/eisaconf.h
@@ -1,4 +1,4 @@
-/*
+/*-
* EISA bus device definitions
*
* Copyright (c) 1995, 1996 Justin T. Gibbs.
diff --git a/sys/dev/em/LICENSE b/sys/dev/em/LICENSE
index de8145e47a90..42545ca85f97 100644
--- a/sys/dev/em/LICENSE
+++ b/sys/dev/em/LICENSE
@@ -1,4 +1,5 @@
$FreeBSD$
+/*-
Copyright (c) 2001-2003, Intel Corporation
All rights reserved.
@@ -27,3 +28,4 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
+*/
diff --git a/sys/dev/en/if_en_pci.c b/sys/dev/en/if_en_pci.c
index 1ca6e35a2ed0..1aaf76108b82 100644
--- a/sys/dev/en/if_en_pci.c
+++ b/sys/dev/en/if_en_pci.c
@@ -1,6 +1,5 @@
/* $NetBSD: if_en_pci.c,v 1.1 1996/06/22 02:00:31 chuck Exp $ */
-/*
- *
+/*-
* Copyright (c) 1996 Charles D. Cranor and Washington University.
* All rights reserved.
*
diff --git a/sys/dev/en/midway.c b/sys/dev/en/midway.c
index 33108381ec81..265b60ea7833 100644
--- a/sys/dev/en/midway.c
+++ b/sys/dev/en/midway.c
@@ -1,8 +1,7 @@
/* $NetBSD: midway.c,v 1.30 1997/09/29 17:40:38 chuck Exp $ */
/* (sync'd to midway.c 1.68) */
-/*
- *
+/*-
* Copyright (c) 1996 Charles D. Cranor and Washington University.
* All rights reserved.
*
diff --git a/sys/dev/en/midwayvar.h b/sys/dev/en/midwayvar.h
index 27da2f57aed2..27e047deffef 100644
--- a/sys/dev/en/midwayvar.h
+++ b/sys/dev/en/midwayvar.h
@@ -1,7 +1,6 @@
/* $NetBSD: midwayvar.h,v 1.10 1997/03/20 21:34:46 chuck Exp $ */
-/*
- *
+/*-
* Copyright (c) 1996 Charles D. Cranor and Washington University.
* All rights reserved.
*
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index 60197577cafe..7cb257321e9d 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1994 Herb Peyerl <hpeyerl@novatel.ca>
* All rights reserved.
*
diff --git a/sys/dev/ep/if_ep_eisa.c b/sys/dev/ep/if_ep_eisa.c
index 9d1e6030d3f7..efe49cf25751 100644
--- a/sys/dev/ep/if_ep_eisa.c
+++ b/sys/dev/ep/if_ep_eisa.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Product specific probe and attach routines for:
* 3COM 3C579 and 3C509(in eisa config mode) ethernet controllers
*
diff --git a/sys/dev/ep/if_ep_isa.c b/sys/dev/ep/if_ep_isa.c
index 5bc38bc5d1f3..bd9c5c25a313 100644
--- a/sys/dev/ep/if_ep_isa.c
+++ b/sys/dev/ep/if_ep_isa.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1994 Herb Peyerl <hpeyerl@novatel.ca>
* All rights reserved.
*
diff --git a/sys/dev/ep/if_ep_pccard.c b/sys/dev/ep/if_ep_pccard.c
index 021b504e1761..5101a176a105 100644
--- a/sys/dev/ep/if_ep_pccard.c
+++ b/sys/dev/ep/if_ep_pccard.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1994 Herb Peyerl <hpeyerl@novatel.ca>
* All rights reserved.
*
diff --git a/sys/dev/ep/if_epreg.h b/sys/dev/ep/if_epreg.h
index acc8f79f0fd0..6f8e968802bd 100644
--- a/sys/dev/ep/if_epreg.h
+++ b/sys/dev/ep/if_epreg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1993 Herb Peyerl (hpeyerl@novatel.ca) All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/esp/ncr53c9x.c b/sys/dev/esp/ncr53c9x.c
index 48686110f30c..a222f3e366a8 100644
--- a/sys/dev/esp/ncr53c9x.c
+++ b/sys/dev/esp/ncr53c9x.c
@@ -63,7 +63,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-/*
+/*-
* Copyright (c) 1994 Peter Galbavy
* Copyright (c) 1995 Paul Kranenburg
* All rights reserved.
diff --git a/sys/dev/esp/ncr53c9xreg.h b/sys/dev/esp/ncr53c9xreg.h
index b4ba1e81f5e3..d85cb452a46a 100644
--- a/sys/dev/esp/ncr53c9xreg.h
+++ b/sys/dev/esp/ncr53c9xreg.h
@@ -1,6 +1,6 @@
/* $NetBSD: ncr53c9xreg.h,v 1.11 2003/02/21 17:14:05 tsutsui Exp $ */
-/*
+/*-
* Copyright (c) 1994 Peter Galbavy. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/esp/ncr53c9xvar.h b/sys/dev/esp/ncr53c9xvar.h
index 7bf6b2d737de..f8be39edd40e 100644
--- a/sys/dev/esp/ncr53c9xvar.h
+++ b/sys/dev/esp/ncr53c9xvar.h
@@ -37,7 +37,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-/*
+/*-
* Copyright (c) 1994 Peter Galbavy. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c
index 7218529b4ffb..33598ba0a155 100644
--- a/sys/dev/ex/if_ex.c
+++ b/sys/dev/ex/if_ex.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1996, Javier Martín Rueda (jmrueda@diatel.upm.es)
* All rights reserved.
*
diff --git a/sys/dev/ex/if_exreg.h b/sys/dev/ex/if_exreg.h
index a924c2822efa..157eda37298c 100644
--- a/sys/dev/ex/if_exreg.h
+++ b/sys/dev/ex/if_exreg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1996, Javier Martín Rueda (jmrueda@diatel.upm.es)
* All rights reserved.
*
diff --git a/sys/dev/exca/excareg.h b/sys/dev/exca/excareg.h
index e2f092aac4dd..094379e79c77 100644
--- a/sys/dev/exca/excareg.h
+++ b/sys/dev/exca/excareg.h
@@ -1,7 +1,7 @@
/* $NetBSD: i82365reg.h,v 1.3 1998/12/20 17:53:28 nathanw Exp $ */
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 2002 M Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/exca/excavar.h b/sys/dev/exca/excavar.h
index 147cf1562229..bc29c81a0990 100644
--- a/sys/dev/exca/excavar.h
+++ b/sys/dev/exca/excavar.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 2002 M Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/fatm/firmware.h b/sys/dev/fatm/firmware.h
index 6e9caf28deb6..24c7bc8e8865 100644
--- a/sys/dev/fatm/firmware.h
+++ b/sys/dev/fatm/firmware.h
@@ -1,4 +1,4 @@
-/*
+/*-
* (Copyright Notice)
*
* Copyright (c) 1995-2000 FORE Systems, Inc., as an unpublished work.
diff --git a/sys/dev/fatm/if_fatm.c b/sys/dev/fatm/if_fatm.c
index 8335e929ff7a..35ef8b9fffaf 100644
--- a/sys/dev/fatm/if_fatm.c
+++ b/sys/dev/fatm/if_fatm.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
* All rights reserved.
diff --git a/sys/dev/fatm/if_fatm_rate.h b/sys/dev/fatm/if_fatm_rate.h
index 45b885a4f1bf..5cfd38a9c28c 100644
--- a/sys/dev/fatm/if_fatm_rate.h
+++ b/sys/dev/fatm/if_fatm_rate.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
* All rights reserved.
diff --git a/sys/dev/fatm/if_fatmreg.h b/sys/dev/fatm/if_fatmreg.h
index 0b4a403d39f9..d488dbfda5bf 100644
--- a/sys/dev/fatm/if_fatmreg.h
+++ b/sys/dev/fatm/if_fatmreg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
* All rights reserved.
diff --git a/sys/dev/fatm/if_fatmvar.h b/sys/dev/fatm/if_fatmvar.h
index 8919d24b0712..8c550fefdd1d 100644
--- a/sys/dev/fatm/if_fatmvar.h
+++ b/sys/dev/fatm/if_fatmvar.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
* All rights reserved.
diff --git a/sys/dev/fb/gallant12x22.h b/sys/dev/fb/gallant12x22.h
index b26ad34f873c..a089f6a2ec46 100644
--- a/sys/dev/fb/gallant12x22.h
+++ b/sys/dev/fb/gallant12x22.h
@@ -1,7 +1,7 @@
/* $OpenBSD: gallant12x22.h,v 1.2 2002/05/09 08:59:03 maja Exp $ */
/* $NetBSD: gallant12x22.h,v 1.2 1999/05/18 21:51:58 ad Exp $ */
-/*
+/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/dev/fb/gfb.h b/sys/dev/fb/gfb.h
index 470dfc268864..89ead2e3a225 100644
--- a/sys/dev/fb/gfb.h
+++ b/sys/dev/fb/gfb.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/dev/fb/tga.h b/sys/dev/fb/tga.h
index 28302485ac54..3616b61bd04c 100644
--- a/sys/dev/fb/tga.h
+++ b/sys/dev/fb/tga.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/dev/fdc/fdc_isa.c b/sys/dev/fdc/fdc_isa.c
index 6700e751f38d..5447294dd0c8 100644
--- a/sys/dev/fdc/fdc_isa.c
+++ b/sys/dev/fdc/fdc_isa.c
@@ -1,23 +1,21 @@
/*-
- * Copyright (c) 2004 M. Warner Losh.
+ * Copyright (c) 2004-2005 M. Warner Losh.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions, and the following disclaimer,
- * without modification, immediately at the beginning of the file.
+ * notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
diff --git a/sys/dev/fdc/fdc_pccard.c b/sys/dev/fdc/fdc_pccard.c
index 1f143c75b0cc..8f7154ab98aa 100644
--- a/sys/dev/fdc/fdc_pccard.c
+++ b/sys/dev/fdc/fdc_pccard.c
@@ -1,23 +1,21 @@
/*-
- * Copyright (c) 2004 M. Warner Losh.
+ * Copyright (c) 2004-2005 M. Warner Losh.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions, and the following disclaimer,
- * without modification, immediately at the beginning of the file.
+ * notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
diff --git a/sys/dev/fdc/fdcvar.h b/sys/dev/fdc/fdcvar.h
index 5ecf9125c3ee..b0077b6822c1 100644
--- a/sys/dev/fdc/fdcvar.h
+++ b/sys/dev/fdc/fdcvar.h
@@ -1,23 +1,21 @@
/*-
- * Copyright (c) 2004 M. Warner Losh.
+ * Copyright (c) 2004-2005 M. Warner Losh.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions, and the following disclaimer,
- * without modification, immediately at the beginning of the file.
+ * notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index ddf3fc50e2de..0caae38a6399 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -1,4 +1,4 @@
-/*
+/*-
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
*
* This software may be used, modified, copied, distributed, and sold, in
diff --git a/sys/dev/fe/if_fe_cbus.c b/sys/dev/fe/if_fe_cbus.c
index 6df70ae92eac..b92cc3df9a97 100644
--- a/sys/dev/fe/if_fe_cbus.c
+++ b/sys/dev/fe/if_fe_cbus.c
@@ -1,4 +1,4 @@
-/*
+/*-
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
*
* This software may be used, modified, copied, distributed, and sold, in
diff --git a/sys/dev/fe/if_fe_isa.c b/sys/dev/fe/if_fe_isa.c
index 1856951b4874..b1fa3e01d41c 100644
--- a/sys/dev/fe/if_fe_isa.c
+++ b/sys/dev/fe/if_fe_isa.c
@@ -1,4 +1,4 @@
-/*
+/*-
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
*
* This software may be used, modified, copied, distributed, and sold, in
diff --git a/sys/dev/fe/if_fe_pccard.c b/sys/dev/fe/if_fe_pccard.c
index 49266deeacea..37c600e51370 100644
--- a/sys/dev/fe/if_fe_pccard.c
+++ b/sys/dev/fe/if_fe_pccard.c
@@ -1,4 +1,4 @@
-/*
+/*-
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
*
* This software may be used, modified, copied, distributed, and sold, in
diff --git a/sys/dev/fe/if_fereg.h b/sys/dev/fe/if_fereg.h
index 21da37ab0d26..afc9c5704c58 100644
--- a/sys/dev/fe/if_fereg.h
+++ b/sys/dev/fe/if_fereg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Hardware specification of various 8696x based Ethernet cards.
* Contributed by M. Sekiguchi <seki@sysrap.cs.fujitsu.co.jp>
*
diff --git a/sys/dev/fe/if_fevar.h b/sys/dev/fe/if_fevar.h
index c8fd35579625..99f7184a4a51 100644
--- a/sys/dev/fe/if_fevar.h
+++ b/sys/dev/fe/if_fevar.h
@@ -1,4 +1,4 @@
-/*
+/*-
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
*
* This software may be used, modified, copied, distributed, and sold, in
diff --git a/sys/dev/firewire/firewire.c b/sys/dev/firewire/firewire.c
index f2b7164eaf11..75236ecd6ee7 100644
--- a/sys/dev/firewire/firewire.c
+++ b/sys/dev/firewire/firewire.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
* All rights reserved.
diff --git a/sys/dev/firewire/firewire.h b/sys/dev/firewire/firewire.h
index 04c62873730e..ab34748bec25 100644
--- a/sys/dev/firewire/firewire.h
+++ b/sys/dev/firewire/firewire.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
* All rights reserved.
diff --git a/sys/dev/firewire/firewire_phy.h b/sys/dev/firewire/firewire_phy.h
index 02cda696ea3f..42feff2d27c8 100644
--- a/sys/dev/firewire/firewire_phy.h
+++ b/sys/dev/firewire/firewire_phy.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
* All rights reserved.
*
diff --git a/sys/dev/firewire/firewirereg.h b/sys/dev/firewire/firewirereg.h
index 3c44a553adeb..3b991ea65236 100644
--- a/sys/dev/firewire/firewirereg.h
+++ b/sys/dev/firewire/firewirereg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
* All rights reserved.
diff --git a/sys/dev/firewire/fwdev.c b/sys/dev/firewire/fwdev.c
index cffb6369b747..79c74af9fe84 100644
--- a/sys/dev/firewire/fwdev.c
+++ b/sys/dev/firewire/fwdev.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
* All rights reserved.
diff --git a/sys/dev/firewire/fwdma.c b/sys/dev/firewire/fwdma.c
index afb1a09b1155..c64dbe66731a 100644
--- a/sys/dev/firewire/fwdma.c
+++ b/sys/dev/firewire/fwdma.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/firewire/fwdma.h b/sys/dev/firewire/fwdma.h
index 6bf66c702d6f..3a8278c1c709 100644
--- a/sys/dev/firewire/fwdma.h
+++ b/sys/dev/firewire/fwdma.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (C) 2003
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/firewire/fwmem.c b/sys/dev/firewire/fwmem.c
index 1674405f44f8..4fac8dd06b4d 100644
--- a/sys/dev/firewire/fwmem.c
+++ b/sys/dev/firewire/fwmem.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2002-2003
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/firewire/fwmem.h b/sys/dev/firewire/fwmem.h
index f8188d10aa25..de717947e844 100644
--- a/sys/dev/firewire/fwmem.h
+++ b/sys/dev/firewire/fwmem.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (C) 2002-2003
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/firewire/fwohci.c b/sys/dev/firewire/fwohci.c
index ad20edcce359..ddcd05d0bccf 100644
--- a/sys/dev/firewire/fwohci.c
+++ b/sys/dev/firewire/fwohci.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
* All rights reserved.
diff --git a/sys/dev/firewire/fwohci_pci.c b/sys/dev/firewire/fwohci_pci.c
index a0f9d815ee64..154f0dfb4980 100644
--- a/sys/dev/firewire/fwohci_pci.c
+++ b/sys/dev/firewire/fwohci_pci.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
* All rights reserved.
diff --git a/sys/dev/firewire/fwohcireg.h b/sys/dev/firewire/fwohcireg.h
index 9abcb417bc41..39986223c4bf 100644
--- a/sys/dev/firewire/fwohcireg.h
+++ b/sys/dev/firewire/fwohcireg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
* All rights reserved.
diff --git a/sys/dev/firewire/fwohcivar.h b/sys/dev/firewire/fwohcivar.h
index 014335a1d992..3002b63c0ce4 100644
--- a/sys/dev/firewire/fwohcivar.h
+++ b/sys/dev/firewire/fwohcivar.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003 Hidetoshi SHimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi SHimokawa
* All rights reserved.
diff --git a/sys/dev/firewire/fwphyreg.h b/sys/dev/firewire/fwphyreg.h
index f2e77768adf7..77a006ed3c54 100644
--- a/sys/dev/firewire/fwphyreg.h
+++ b/sys/dev/firewire/fwphyreg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (C) 2003
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/firewire/iec13213.h b/sys/dev/firewire/iec13213.h
index 744172563e09..058649fc0cc4 100644
--- a/sys/dev/firewire/iec13213.h
+++ b/sys/dev/firewire/iec13213.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
* All rights reserved.
@@ -217,12 +217,12 @@ uint16_t crom_crc(uint32_t *r, int);
struct csrreg *crom_search_key(struct crom_context *, uint8_t);
int crom_has_specver(uint32_t *, uint32_t, uint32_t);
-#ifndef _KERNEL
+#if !defined(_KERNEL) && !defined(_BOOT)
char *crom_desc(struct crom_context *, char *, int);
#endif
/* For CROM build */
-#if defined(_KERNEL) || defined(TEST)
+#if defined(_KERNEL) || defined(_BOOT) || defined(TEST)
#define CROM_MAX_CHUNK_LEN 20
struct crom_src {
struct csrhdr hdr;
diff --git a/sys/dev/firewire/iec68113.h b/sys/dev/firewire/iec68113.h
index 58a8cfe7d9eb..11f3042ff9b0 100644
--- a/sys/dev/firewire/iec68113.h
+++ b/sys/dev/firewire/iec68113.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
* All rights reserved.
diff --git a/sys/dev/firewire/if_fwe.c b/sys/dev/firewire/if_fwe.c
index 96d903c78a96..75fa35660c3f 100644
--- a/sys/dev/firewire/if_fwe.c
+++ b/sys/dev/firewire/if_fwe.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2002-2003
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/firewire/if_fwevar.h b/sys/dev/firewire/if_fwevar.h
index 97422168621b..805301a1be1e 100644
--- a/sys/dev/firewire/if_fwevar.h
+++ b/sys/dev/firewire/if_fwevar.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2002-2003
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/firewire/if_fwip.c b/sys/dev/firewire/if_fwip.c
index 2c11a253ecbe..23e812a2e76d 100644
--- a/sys/dev/firewire/if_fwip.c
+++ b/sys/dev/firewire/if_fwip.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2004
* Doug Rabson
* Copyright (c) 2002-2003
diff --git a/sys/dev/firewire/if_fwipvar.h b/sys/dev/firewire/if_fwipvar.h
index fe202180a274..0a9ef244752e 100644
--- a/sys/dev/firewire/if_fwipvar.h
+++ b/sys/dev/firewire/if_fwipvar.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2004
* Doug Rabson
* Copyright (c) 2002-2003
diff --git a/sys/dev/firewire/sbp.c b/sys/dev/firewire/sbp.c
index 89b9631d828c..658fc351fcae 100644
--- a/sys/dev/firewire/sbp.c
+++ b/sys/dev/firewire/sbp.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
* All rights reserved.
diff --git a/sys/dev/firewire/sbp.h b/sys/dev/firewire/sbp.h
index 49ec97e0caeb..9f85fab38de5 100644
--- a/sys/dev/firewire/sbp.h
+++ b/sys/dev/firewire/sbp.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
* All rights reserved.
diff --git a/sys/dev/firewire/sbp_targ.c b/sys/dev/firewire/sbp_targ.c
index c6fea6bcbe50..5267ea3b3532 100644
--- a/sys/dev/firewire/sbp_targ.c
+++ b/sys/dev/firewire/sbp_targ.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (C) 2003
* Hidetoshi Shimokawa. All rights reserved.
*
diff --git a/sys/dev/fxp/if_fxpreg.h b/sys/dev/fxp/if_fxpreg.h
index 1e8d660e4c6e..b1c8407adabe 100644
--- a/sys/dev/fxp/if_fxpreg.h
+++ b/sys/dev/fxp/if_fxpreg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1995, David Greenman
* Copyright (c) 2001 Jonathan Lemon <jlemon@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/fxp/if_fxpvar.h b/sys/dev/fxp/if_fxpvar.h
index 8168bd308f53..906fea6cb9a4 100644
--- a/sys/dev/fxp/if_fxpvar.h
+++ b/sys/dev/fxp/if_fxpvar.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1995, David Greenman
* All rights reserved.
*
diff --git a/sys/dev/fxp/rcvbundl.h b/sys/dev/fxp/rcvbundl.h
index e97e9aaf5b38..ec9b99bd33aa 100644
--- a/sys/dev/fxp/rcvbundl.h
+++ b/sys/dev/fxp/rcvbundl.h
@@ -1,4 +1,4 @@
-/*
+/*-
Copyright (c) 1999-2001, Intel Corporation
All rights reserved.
diff --git a/sys/dev/gem/if_gem_pci.c b/sys/dev/gem/if_gem_pci.c
index 19c0de2628ec..58988900e86f 100644
--- a/sys/dev/gem/if_gem_pci.c
+++ b/sys/dev/gem/if_gem_pci.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (C) 2001 Eduardo Horvath.
* All rights reserved.
*
diff --git a/sys/dev/gem/if_gemreg.h b/sys/dev/gem/if_gemreg.h
index 700c732d0ebc..fecfb152eddd 100644
--- a/sys/dev/gem/if_gemreg.h
+++ b/sys/dev/gem/if_gemreg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (C) 2001 Eduardo Horvath.
* All rights reserved.
*
diff --git a/sys/dev/gem/if_gemvar.h b/sys/dev/gem/if_gemvar.h
index d93728e225f9..07d71e11f02e 100644
--- a/sys/dev/gem/if_gemvar.h
+++ b/sys/dev/gem/if_gemvar.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (C) 2001 Eduardo Horvath.
* All rights reserved.
*
diff --git a/sys/dev/gfb/gfb_pci.c b/sys/dev/gfb/gfb_pci.c
index ba57878d8d04..c58ae0e021e1 100644
--- a/sys/dev/gfb/gfb_pci.c
+++ b/sys/dev/gfb/gfb_pci.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/dev/gfb/gfb_pci.h b/sys/dev/gfb/gfb_pci.h
index e0f517e7331a..263b3980c5b8 100644
--- a/sys/dev/gfb/gfb_pci.h
+++ b/sys/dev/gfb/gfb_pci.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/dev/harp/if_harp.c b/sys/dev/harp/if_harp.c
index 435b64e293e8..7a0352036e45 100644
--- a/sys/dev/harp/if_harp.c
+++ b/sys/dev/harp/if_harp.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
* All rights reserved.
diff --git a/sys/dev/hatm/if_hatm.c b/sys/dev/hatm/if_hatm.c
index 823801781bd2..cf5b182cfd2f 100644
--- a/sys/dev/hatm/if_hatm.c
+++ b/sys/dev/hatm/if_hatm.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
* All rights reserved.
diff --git a/sys/dev/hatm/if_hatm_intr.c b/sys/dev/hatm/if_hatm_intr.c
index 2dbfc693e038..70bbde89a531 100644
--- a/sys/dev/hatm/if_hatm_intr.c
+++ b/sys/dev/hatm/if_hatm_intr.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
* All rights reserved.
diff --git a/sys/dev/hatm/if_hatm_ioctl.c b/sys/dev/hatm/if_hatm_ioctl.c
index 410be9db4733..c81027911505 100644
--- a/sys/dev/hatm/if_hatm_ioctl.c
+++ b/sys/dev/hatm/if_hatm_ioctl.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
* All rights reserved.
diff --git a/sys/dev/hatm/if_hatm_rx.c b/sys/dev/hatm/if_hatm_rx.c
index fb80f81bb673..1b3ee8d437cc 100644
--- a/sys/dev/hatm/if_hatm_rx.c
+++ b/sys/dev/hatm/if_hatm_rx.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
* All rights reserved.
diff --git a/sys/dev/hatm/if_hatm_tx.c b/sys/dev/hatm/if_hatm_tx.c
index a7c2452431ff..b084b9e17ecf 100644
--- a/sys/dev/hatm/if_hatm_tx.c
+++ b/sys/dev/hatm/if_hatm_tx.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
* All rights reserved.
diff --git a/sys/dev/hatm/if_hatmconf.h b/sys/dev/hatm/if_hatmconf.h
index 9d2d794c1339..5402697410d7 100644
--- a/sys/dev/hatm/if_hatmconf.h
+++ b/sys/dev/hatm/if_hatmconf.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
* All rights reserved.
diff --git a/sys/dev/hatm/if_hatmreg.h b/sys/dev/hatm/if_hatmreg.h
index 7e88a5c61e5a..9085f07f5a4b 100644
--- a/sys/dev/hatm/if_hatmreg.h
+++ b/sys/dev/hatm/if_hatmreg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
* All rights reserved.
diff --git a/sys/dev/hatm/if_hatmvar.h b/sys/dev/hatm/if_hatmvar.h
index 2ca6f9473031..acddaa1e3555 100644
--- a/sys/dev/hatm/if_hatmvar.h
+++ b/sys/dev/hatm/if_hatmvar.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
* All rights reserved.
diff --git a/sys/dev/hfa/fore.h b/sys/dev/hfa/fore.h
index 5b64c31864ae..8f0a17f58a9c 100644
--- a/sys/dev/hfa/fore.h
+++ b/sys/dev/hfa/fore.h
@@ -1,4 +1,4 @@
-/*
+/*-
*
* ===================================
* HARP | Host ATM Research Platform
diff --git a/sys/dev/hfa/fore_aali.h b/sys/dev/hfa/fore_aali.h
index 3e00a941072f..93fbf5d587e2 100644
--- a/sys/dev/hfa/fore_aali.h
+++ b/sys/dev/hfa/fore_aali.h
@@ -1,4 +1,4 @@
-/*
+/*-
*
* ===================================
* HARP | Host ATM Research Platform
diff --git a/sys/dev/hfa/fore_command.c b/sys/dev/hfa/fore_command.c
index 84b36808445e..c7e38892e460 100644
--- a/sys/dev/hfa/fore_command.c
+++ b/sys/dev/hfa/fore_command.c
@@ -1,4 +1,4 @@
-/*
+/*-
*
* ===================================
* HARP | Host ATM Research Platform
diff --git a/sys/dev/hfa/fore_if.c b/sys/dev/hfa/fore_if.c
index f4f796ffa435..51bbd0fb6933 100644
--- a/sys/dev/hfa/fore_if.c
+++ b/sys/dev/hfa/fore_if.c
@@ -1,4 +1,4 @@
-/*
+/*-
*
* ===================================
* HARP | Host ATM Research Platform
diff --git a/sys/dev/hfa/fore_include.h b/sys/dev/hfa/fore_include.h
index c23e0cb294f0..93062f451f63 100644
--- a/sys/dev/hfa/fore_include.h
+++ b/sys/dev/hfa/fore_include.h
@@ -1,4 +1,4 @@
-/*
+/*-
*
* ===================================
* HARP | Host ATM Research Platform
diff --git a/sys/dev/hfa/fore_init.c b/sys/dev/hfa/fore_init.c
index 6124bdaaefd3..ccaed3f0e085 100644
--- a/sys/dev/hfa/fore_init.c
+++ b/sys/dev/hfa/fore_init.c
@@ -1,4 +1,4 @@
-/*
+/*-
*
* ===================================
* HARP | Host ATM Research Platform
diff --git a/sys/dev/hfa/fore_intr.c b/sys/dev/hfa/fore_intr.c
index 9c0f29dabba7..8454b93f2464 100644
--- a/sys/dev/hfa/fore_intr.c
+++ b/sys/dev/hfa/fore_intr.c
@@ -1,4 +1,4 @@
-/*
+/*-
*
* ===================================
* HARP | Host ATM Research Platform
diff --git a/sys/dev/hfa/fore_output.c b/sys/dev/hfa/fore_output.c
index a37e2ecb0cba..d4ab4dd921ba 100644
--- a/sys/dev/hfa/fore_output.c
+++ b/sys/dev/hfa/fore_output.c
@@ -1,4 +1,4 @@
-/*
+/*-
*
* ===================================
* HARP | Host ATM Research Platform
diff --git a/sys/dev/hfa/fore_slave.h b/sys/dev/hfa/fore_slave.h
index 83960d977e4b..33d73c21dced 100644
--- a/sys/dev/hfa/fore_slave.h
+++ b/sys/dev/hfa/fore_slave.h
@@ -1,4 +1,4 @@
-/*
+/*-
*
* ===================================
* HARP | Host ATM Research Platform
diff --git a/sys/dev/hfa/fore_stats.c b/sys/dev/hfa/fore_stats.c
index 17f165724387..4126c1f0635c 100644
--- a/sys/dev/hfa/fore_stats.c
+++ b/sys/dev/hfa/fore_stats.c
@@ -1,4 +1,4 @@
-/*
+/*-
* ===================================
* HARP | Host ATM Research Platform
* ===================================
diff --git a/sys/dev/hfa/fore_stats.h b/sys/dev/hfa/fore_stats.h
index 53b568f69ebd..32095164d8e4 100644
--- a/sys/dev/hfa/fore_stats.h
+++ b/sys/dev/hfa/fore_stats.h
@@ -1,4 +1,4 @@
-/*
+/*-
*
* ===================================
* HARP | Host ATM Research Platform
diff --git a/sys/dev/hfa/fore_var.h b/sys/dev/hfa/fore_var.h
index d0f05b8de114..57cedb3a761f 100644
--- a/sys/dev/hfa/fore_var.h
+++ b/sys/dev/hfa/fore_var.h
@@ -1,4 +1,4 @@
-/*
+/*-
*
* ===================================
* HARP | Host ATM Research Platform
diff --git a/sys/dev/hfa/fore_vcm.c b/sys/dev/hfa/fore_vcm.c
index cd0dd3c495df..95bc6524be99 100644
--- a/sys/dev/hfa/fore_vcm.c
+++ b/sys/dev/hfa/fore_vcm.c
@@ -1,4 +1,4 @@
-/*
+/*-
*
* ===================================
* HARP | Host ATM Research Platform
diff --git a/sys/dev/hifn/hifn7751.c b/sys/dev/hifn/hifn7751.c
index f058a5e6d7da..a4354949e78f 100644
--- a/sys/dev/hifn/hifn7751.c
+++ b/sys/dev/hifn/hifn7751.c
@@ -1,6 +1,6 @@
/* $OpenBSD: hifn7751.c,v 1.120 2002/05/17 00:33:34 deraadt Exp $ */
-/*
+/*-
* Invertex AEON / Hifn 7751 driver
* Copyright (c) 1999 Invertex Inc. All rights reserved.
* Copyright (c) 1999 Theo de Raadt
diff --git a/sys/dev/hifn/hifn7751reg.h b/sys/dev/hifn/hifn7751reg.h
index 5946f96c7886..a1022887f2d7 100644
--- a/sys/dev/hifn/hifn7751reg.h
+++ b/sys/dev/hifn/hifn7751reg.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* $OpenBSD: hifn7751reg.h,v 1.35 2002/04/08 17:49:42 jason Exp $ */
-/*
+/*-
* Invertex AEON / Hifn 7751 driver
* Copyright (c) 1999 Invertex Inc. All rights reserved.
* Copyright (c) 1999 Theo de Raadt
diff --git a/sys/dev/hifn/hifn7751var.h b/sys/dev/hifn/hifn7751var.h
index f8976cf39f36..046d204d8314 100644
--- a/sys/dev/hifn/hifn7751var.h
+++ b/sys/dev/hifn/hifn7751var.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* $OpenBSD: hifn7751var.h,v 1.42 2002/04/08 17:49:42 jason Exp $ */
-/*
+/*-
* Invertex AEON / Hifn 7751 driver
* Copyright (c) 1999 Invertex Inc. All rights reserved.
* Copyright (c) 1999 Theo de Raadt
diff --git a/sys/dev/hptmv/entry.c b/sys/dev/hptmv/entry.c
index 9cc3a2ba0c75..5a7a064528a7 100644
--- a/sys/dev/hptmv/entry.c
+++ b/sys/dev/hptmv/entry.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003-2004 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptmv/global.h b/sys/dev/hptmv/global.h
index 3b8d99c5dfbb..3f8d4dd7ae3b 100644
--- a/sys/dev/hptmv/global.h
+++ b/sys/dev/hptmv/global.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003-2004 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptmv/hptintf.h b/sys/dev/hptmv/hptintf.h
index 5b54475593e7..9839a6718271 100644
--- a/sys/dev/hptmv/hptintf.h
+++ b/sys/dev/hptmv/hptintf.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003-2004 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptmv/mv.c b/sys/dev/hptmv/mv.c
index b135bfa2215c..474b3d5ddb23 100644
--- a/sys/dev/hptmv/mv.c
+++ b/sys/dev/hptmv/mv.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003-2004 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptmv/mvOs.h b/sys/dev/hptmv/mvOs.h
index 3325d14c7cc1..2c0a5f4b1c66 100644
--- a/sys/dev/hptmv/mvOs.h
+++ b/sys/dev/hptmv/mvOs.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003-2004 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/hptmv/osbsd.h b/sys/dev/hptmv/osbsd.h
index f9a41fcb73a4..5637c44c5e9a 100644
--- a/sys/dev/hptmv/osbsd.h
+++ b/sys/dev/hptmv/osbsd.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003-2004 HighPoint Technologies, Inc.
* All rights reserved.
*
diff --git a/sys/dev/ic/cd180.h b/sys/dev/ic/cd180.h
index a9a5a83348e0..ae46a4809b68 100644
--- a/sys/dev/ic/cd180.h
+++ b/sys/dev/ic/cd180.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (C) 1995 by Pavel Antonov, Moscow, Russia.
* Copyright (C) 1995 by Andrey A. Chernov, Moscow, Russia.
* All rights reserved.
diff --git a/sys/dev/ic/hd64570.h b/sys/dev/ic/hd64570.h
index b676e25a9cd5..3399e0a0de57 100644
--- a/sys/dev/ic/hd64570.h
+++ b/sys/dev/ic/hd64570.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1995 John Hay. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/ic/wd33c93reg.h b/sys/dev/ic/wd33c93reg.h
index c286c65a16eb..8e536cd1d32d 100644
--- a/sys/dev/ic/wd33c93reg.h
+++ b/sys/dev/ic/wd33c93reg.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* $NecBSD: wd33c93reg.h,v 1.21.24.1 2001/06/13 05:52:05 honda Exp $ */
/* $NetBSD$ */
-/*
+/*-
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1996, 1997, 1998
* NetBSD/pc98 porting staff. All rights reserved.
diff --git a/sys/dev/ichsmb/ichsmb.c b/sys/dev/ichsmb/ichsmb.c
index 0d8dd59b07a3..2d92a65f9fe5 100644
--- a/sys/dev/ichsmb/ichsmb.c
+++ b/sys/dev/ichsmb/ichsmb.c
@@ -1,5 +1,4 @@
-
-/*
+/*-
* ichsmb.c
*
* Author: Archie Cobbs <archie@freebsd.org>
diff --git a/sys/dev/ichsmb/ichsmb_reg.h b/sys/dev/ichsmb/ichsmb_reg.h
index ca0577c7d178..a031607f4fdc 100644
--- a/sys/dev/ichsmb/ichsmb_reg.h
+++ b/sys/dev/ichsmb/ichsmb_reg.h
@@ -1,5 +1,4 @@
-
-/*
+/*-
* ichsmb_reg.h
*
* Copyright (c) 2000 Whistle Communications, Inc.
diff --git a/sys/dev/ichsmb/ichsmb_var.h b/sys/dev/ichsmb/ichsmb_var.h
index 99abbe55afbe..d8def6de9c48 100644
--- a/sys/dev/ichsmb/ichsmb_var.h
+++ b/sys/dev/ichsmb/ichsmb_var.h
@@ -1,5 +1,4 @@
-
-/*
+/*-
* ichsmb_var.h
*
* Copyright (c) 2000 Whistle Communications, Inc.
diff --git a/sys/dev/ichwd/ichwd.c b/sys/dev/ichwd/ichwd.c
index 73f871990c2f..893efbd722d4 100644
--- a/sys/dev/ichwd/ichwd.c
+++ b/sys/dev/ichwd/ichwd.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2004 Texas A&M University
* All rights reserved.
*
diff --git a/sys/dev/ichwd/ichwd.h b/sys/dev/ichwd/ichwd.h
index ab0e117fbdf8..ef08b2ff7ef5 100644
--- a/sys/dev/ichwd/ichwd.h
+++ b/sys/dev/ichwd/ichwd.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2004 Texas A&M University
* All rights reserved.
*
diff --git a/sys/dev/ida/ida_eisa.c b/sys/dev/ida/ida_eisa.c
index be247864ab96..a4f8cd535522 100644
--- a/sys/dev/ida/ida_eisa.c
+++ b/sys/dev/ida/ida_eisa.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000 Jonathan Lemon
* Copyright (c) 1999 by Matthew N. Dodd <winter@jurai.net>
* All Rights Reserved.
diff --git a/sys/dev/idt/idt.c b/sys/dev/idt/idt.c
index 0edceeb9bb10..fbcd9161ab04 100644
--- a/sys/dev/idt/idt.c
+++ b/sys/dev/idt/idt.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000, 2001 Richard Hodges and Matriplex, inc.
* All rights reserved.
*
diff --git a/sys/dev/idt/idt_harp.c b/sys/dev/idt/idt_harp.c
index 61cbdf9d1a7c..4659c4689037 100644
--- a/sys/dev/idt/idt_harp.c
+++ b/sys/dev/idt/idt_harp.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000, 2001 Richard Hodges and Matriplex, inc.
* All rights reserved.
*
diff --git a/sys/dev/idt/idt_pci.c b/sys/dev/idt/idt_pci.c
index 1112d31d48ae..035b68f96f4c 100644
--- a/sys/dev/idt/idt_pci.c
+++ b/sys/dev/idt/idt_pci.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000, 2001 Richard Hodges and Matriplex, inc.
* All rights reserved.
*
diff --git a/sys/dev/idt/idtreg.h b/sys/dev/idt/idtreg.h
index 43ede7e292da..230bbbb1c78c 100644
--- a/sys/dev/idt/idtreg.h
+++ b/sys/dev/idt/idtreg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000, 2001 Richard Hodges and Matriplex, inc.
* All rights reserved.
*
diff --git a/sys/dev/idt/idtvar.h b/sys/dev/idt/idtvar.h
index 6761a00ee4df..b98ee1af2dad 100644
--- a/sys/dev/idt/idtvar.h
+++ b/sys/dev/idt/idtvar.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000, 2001 Richard Hodges and Matriplex, inc.
* All rights reserved.
*
diff --git a/sys/dev/ie/if_iee16.h b/sys/dev/ie/if_iee16.h
index dcd8bae8155a..1196676cfed2 100644
--- a/sys/dev/ie/if_iee16.h
+++ b/sys/dev/ie/if_iee16.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1993, 1994, 1995
* Rodney W. Grimes, Milwaukie, Oregon 97222. All rights reserved.
*
diff --git a/sys/dev/if_ndis/if_ndis.c b/sys/dev/if_ndis/if_ndis.c
index f6a2799b0abc..1180ea93f979 100644
--- a/sys/dev/if_ndis/if_ndis.c
+++ b/sys/dev/if_ndis/if_ndis.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/if_ndis/if_ndis_pccard.c b/sys/dev/if_ndis/if_ndis_pccard.c
index 8f26eaca8552..0786b016020b 100644
--- a/sys/dev/if_ndis/if_ndis_pccard.c
+++ b/sys/dev/if_ndis/if_ndis_pccard.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/if_ndis/if_ndis_pci.c b/sys/dev/if_ndis/if_ndis_pci.c
index 00f4086ab157..8af48f4a0304 100644
--- a/sys/dev/if_ndis/if_ndis_pci.c
+++ b/sys/dev/if_ndis/if_ndis_pci.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/if_ndis/if_ndisvar.h b/sys/dev/if_ndis/if_ndisvar.h
index 0e6074426322..b06ac0131bbe 100644
--- a/sys/dev/if_ndis/if_ndisvar.h
+++ b/sys/dev/if_ndis/if_ndisvar.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/iicbus/iicbb_if.m b/sys/dev/iicbus/iicbb_if.m
index 564274166968..7d10fe748b22 100644
--- a/sys/dev/iicbus/iicbb_if.m
+++ b/sys/dev/iicbus/iicbb_if.m
@@ -1,4 +1,4 @@
-#
+#-
# Copyright (c) 1998 Nicolas Souchu
# All rights reserved.
#
diff --git a/sys/dev/iicbus/iicbus_if.m b/sys/dev/iicbus/iicbus_if.m
index eddc022b97d7..068cf4d86ff3 100644
--- a/sys/dev/iicbus/iicbus_if.m
+++ b/sys/dev/iicbus/iicbus_if.m
@@ -1,4 +1,4 @@
-#
+#-
# Copyright (c) 1998 Nicolas Souchu
# All rights reserved.
#
diff --git a/sys/dev/iir/iir.c b/sys/dev/iir/iir.c
index b1c9992827c5..60b2962e64fd 100644
--- a/sys/dev/iir/iir.c
+++ b/sys/dev/iir/iir.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000-04 ICP vortex GmbH
* Copyright (c) 2002-04 Intel Corporation
* Copyright (c) 2003-04 Adaptec Inc.
diff --git a/sys/dev/iir/iir.h b/sys/dev/iir/iir.h
index 688cf634d153..830cf087e9c5 100644
--- a/sys/dev/iir/iir.h
+++ b/sys/dev/iir/iir.h
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 2000-04 ICP vortex GmbH
* Copyright (c) 2002-04 Intel Corporation
* Copyright (c) 2003-04 Adaptec Inc.
diff --git a/sys/dev/iir/iir_ctrl.c b/sys/dev/iir/iir_ctrl.c
index 4d976b3e9e81..172d85bd22ba 100644
--- a/sys/dev/iir/iir_ctrl.c
+++ b/sys/dev/iir/iir_ctrl.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000-03 ICP vortex GmbH
* Copyright (c) 2002-03 Intel Corporation
* Copyright (c) 2003 Adaptec Inc.
diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c
index 9859eac3bdf8..d009cd7273ec 100644
--- a/sys/dev/isp/isp.c
+++ b/sys/dev/isp/isp.c
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* Machine and OS Independent (well, as best as possible)
* code for the Qlogic ISP SCSI adapters.
*
diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c
index c7038abc2fe5..4132b5a0d205 100644
--- a/sys/dev/isp/isp_freebsd.c
+++ b/sys/dev/isp/isp_freebsd.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Platform (FreeBSD) dependent common attachment code for Qlogic adapters.
*
* Copyright (c) 1997, 1998, 1999, 2000, 2001 by Matthew Jacob
diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h
index 3f60a948a3b6..4b1586c1b295 100644
--- a/sys/dev/isp/isp_freebsd.h
+++ b/sys/dev/isp/isp_freebsd.h
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions
* Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002 by Matthew Jacob
*
diff --git a/sys/dev/isp/isp_inline.h b/sys/dev/isp/isp_inline.h
index 6bc54fbf08e7..e78eb7621c1b 100644
--- a/sys/dev/isp/isp_inline.h
+++ b/sys/dev/isp/isp_inline.h
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* Qlogic Host Adapter Inline Functions
*
* Copyright (c) 1999, 2000, 2001 by Matthew Jacob
diff --git a/sys/dev/isp/isp_ioctl.h b/sys/dev/isp/isp_ioctl.h
index 93ccc53f9ceb..921272aa2490 100644
--- a/sys/dev/isp/isp_ioctl.h
+++ b/sys/dev/isp/isp_ioctl.h
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 2001 by Matthew Jacob
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/isp/isp_target.c b/sys/dev/isp/isp_target.c
index efe1d549a8d1..1d4b397bbad5 100644
--- a/sys/dev/isp/isp_target.c
+++ b/sys/dev/isp/isp_target.c
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* Machine and OS Independent Target Mode Code for the Qlogic SCSI/FC adapters.
*
* Copyright (c) 1999, 2000, 2001 by Matthew Jacob
diff --git a/sys/dev/isp/isp_target.h b/sys/dev/isp/isp_target.h
index 70f68c9c5409..dff513dd5a1c 100644
--- a/sys/dev/isp/isp_target.h
+++ b/sys/dev/isp/isp_target.h
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* Qlogic Target Mode Structure and Flag Definitions
*
* Copyright (c) 1997, 1998
diff --git a/sys/dev/isp/isp_tpublic.h b/sys/dev/isp/isp_tpublic.h
index 358e956036d9..a2773323d68e 100644
--- a/sys/dev/isp/isp_tpublic.h
+++ b/sys/dev/isp/isp_tpublic.h
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* Qlogic ISP Host Adapter Public Target Interface Structures && Routines
*---------------------------------------
* Copyright (c) 2000 by Matthew Jacob
diff --git a/sys/dev/isp/ispmbox.h b/sys/dev/isp/ispmbox.h
index 77aeb00c5ec9..4834fd32c79b 100644
--- a/sys/dev/isp/ispmbox.h
+++ b/sys/dev/isp/ispmbox.h
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* Mailbox and Queue Entry Definitions for for Qlogic ISP SCSI adapters.
*
* Copyright (c) 1997, 1998, 1999, 2000 by Matthew Jacob
diff --git a/sys/dev/isp/ispreg.h b/sys/dev/isp/ispreg.h
index 2f51790819e2..163ac9894d90 100644
--- a/sys/dev/isp/ispreg.h
+++ b/sys/dev/isp/ispreg.h
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* Machine Independent (well, as best as possible) register
* definitions for Qlogic ISP SCSI adapters.
*
diff --git a/sys/dev/isp/ispvar.h b/sys/dev/isp/ispvar.h
index 0810a4899068..b5aa8deed4c1 100644
--- a/sys/dev/isp/ispvar.h
+++ b/sys/dev/isp/ispvar.h
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* Soft Definitions for for Qlogic ISP SCSI adapters.
*
* Copyright (c) 1997, 1998, 1999, 2000 by Matthew Jacob
diff --git a/sys/dev/ispfw/asm_1000.h b/sys/dev/ispfw/asm_1000.h
index 965d0b084d7c..fb064094d30b 100644
--- a/sys/dev/ispfw/asm_1000.h
+++ b/sys/dev/ispfw/asm_1000.h
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc.
* All rights reserved.
*
diff --git a/sys/dev/ispfw/asm_1040.h b/sys/dev/ispfw/asm_1040.h
index dbb3992e67e8..9e78a56e5c11 100644
--- a/sys/dev/ispfw/asm_1040.h
+++ b/sys/dev/ispfw/asm_1040.h
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc.
* All rights reserved.
*
diff --git a/sys/dev/ispfw/asm_1080.h b/sys/dev/ispfw/asm_1080.h
index de896a08b5df..edb0ad711a28 100644
--- a/sys/dev/ispfw/asm_1080.h
+++ b/sys/dev/ispfw/asm_1080.h
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc.
* All rights reserved.
*
diff --git a/sys/dev/ispfw/asm_12160.h b/sys/dev/ispfw/asm_12160.h
index 7279007f29b1..bc1d42089853 100644
--- a/sys/dev/ispfw/asm_12160.h
+++ b/sys/dev/ispfw/asm_12160.h
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc.
* All rights reserved.
*
diff --git a/sys/dev/ispfw/asm_2100.h b/sys/dev/ispfw/asm_2100.h
index f593ec3f45cf..399707d57543 100644
--- a/sys/dev/ispfw/asm_2100.h
+++ b/sys/dev/ispfw/asm_2100.h
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc.
* All rights reserved.
*
diff --git a/sys/dev/ispfw/asm_2200.h b/sys/dev/ispfw/asm_2200.h
index 8bd389f236c8..3d92bf7c99e4 100644
--- a/sys/dev/ispfw/asm_2200.h
+++ b/sys/dev/ispfw/asm_2200.h
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc.
* All rights reserved.
*
diff --git a/sys/dev/ispfw/asm_2300.h b/sys/dev/ispfw/asm_2300.h
index 152b05700639..662bb5b11bdf 100644
--- a/sys/dev/ispfw/asm_2300.h
+++ b/sys/dev/ispfw/asm_2300.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
-/*
- * Copyright (C) 2001 Qlogic, Inc.
+/*-
+ * Copyright (C) 2001, 2002, 2003 by Qlogic, Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted provided
diff --git a/sys/dev/ixgb/LICENSE b/sys/dev/ixgb/LICENSE
index 35e396476bb9..501764514696 100644
--- a/sys/dev/ixgb/LICENSE
+++ b/sys/dev/ixgb/LICENSE
@@ -1,4 +1,6 @@
/*$FreeBSD$*/
+/*-
+
Copyright (c) 2001-2004, Intel Corporation
All rights reserved.
@@ -27,3 +29,5 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
+
+*/
diff --git a/sys/dev/lge/if_lge.c b/sys/dev/lge/if_lge.c
index 12912f2298d0..6a8ab86f8b77 100644
--- a/sys/dev/lge/if_lge.c
+++ b/sys/dev/lge/if_lge.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2000, 2001
* Bill Paul <william.paul@windriver.com>. All rights reserved.
diff --git a/sys/dev/lge/if_lgereg.h b/sys/dev/lge/if_lgereg.h
index 28a6aec85f41..7c552b03f2e0 100644
--- a/sys/dev/lge/if_lgereg.h
+++ b/sys/dev/lge/if_lgereg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2000, 2001
* Bill Paul <wpaul@bsdi.com>. All rights reserved.
diff --git a/sys/dev/lnc/if_lnc_cbus.c b/sys/dev/lnc/if_lnc_cbus.c
index c03afc6b4ddb..c52d56ecc3f5 100644
--- a/sys/dev/lnc/if_lnc_cbus.c
+++ b/sys/dev/lnc/if_lnc_cbus.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1994-2000
* Paul Richards. All rights reserved.
*
diff --git a/sys/dev/lnc/if_lnc_isa.c b/sys/dev/lnc/if_lnc_isa.c
index 5f6ed66abb36..f53fd4629fd3 100644
--- a/sys/dev/lnc/if_lnc_isa.c
+++ b/sys/dev/lnc/if_lnc_isa.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1994-2000
* Paul Richards. All rights reserved.
*
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index 4f09744c5287..631983e11f30 100644
--- a/sys/dev/mcd/mcd.c
+++ b/sys/dev/mcd/mcd.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright 1993 by Holger Veit (data part)
* Copyright 1993 by Brian Moore (audio part)
* Changes Copyright 1993 by Gary Clark II
diff --git a/sys/dev/mcd/mcdreg.h b/sys/dev/mcd/mcdreg.h
index cc8a3ab7163a..7a255afa04df 100644
--- a/sys/dev/mcd/mcdreg.h
+++ b/sys/dev/mcd/mcdreg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright 1993 by Holger Veit (data part)
* Copyright 1993 by Brian Moore (audio part)
* Changes Copyright 1993 by Gary Clark II
diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c
index 607c492dbc7a..ac182c2cb797 100644
--- a/sys/dev/md/md.c
+++ b/sys/dev/md/md.c
@@ -1,4 +1,4 @@
-/*
+/*-
* ----------------------------------------------------------------------------
* "THE BEER-WARE LICENSE" (Revision 42):
* <phk@FreeBSD.ORG> wrote this file. As long as you retain this notice you
@@ -10,7 +10,7 @@
*
*/
-/*
+/*-
* The following functions are based in the vn(4) driver: mdstart_swap(),
* mdstart_vnode(), mdcreate_swap(), mdcreate_vnode() and mddestroy(),
* and as such under the following copyright:
diff --git a/sys/dev/mii/acphy.c b/sys/dev/mii/acphy.c
index 78aa5561b7f6..aba0b26f9bdf 100644
--- a/sys/dev/mii/acphy.c
+++ b/sys/dev/mii/acphy.c
@@ -35,7 +35,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-/*
+/*-
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/mii/amphy.c b/sys/dev/mii/amphy.c
index ca13a844892d..dac0938ec1ba 100644
--- a/sys/dev/mii/amphy.c
+++ b/sys/dev/mii/amphy.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/mii/amphyreg.h b/sys/dev/mii/amphyreg.h
index ffc362a8c7b1..6cdbc95647b5 100644
--- a/sys/dev/mii/amphyreg.h
+++ b/sys/dev/mii/amphyreg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/mii/bmtphy.c b/sys/dev/mii/bmtphy.c
index c180b5ef5928..b086c8680ef3 100644
--- a/sys/dev/mii/bmtphy.c
+++ b/sys/dev/mii/bmtphy.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/mii/bmtphyreg.h b/sys/dev/mii/bmtphyreg.h
index 7f2956ad0b75..223d631a54d5 100644
--- a/sys/dev/mii/bmtphyreg.h
+++ b/sys/dev/mii/bmtphyreg.h
@@ -1,4 +1,3 @@
-
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c
index 85cf768b2263..9e62df19ac1f 100644
--- a/sys/dev/mii/brgphy.c
+++ b/sys/dev/mii/brgphy.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/mii/brgphyreg.h b/sys/dev/mii/brgphyreg.h
index 786f49dae8d5..bb9636d882fb 100644
--- a/sys/dev/mii/brgphyreg.h
+++ b/sys/dev/mii/brgphyreg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/mii/ciphy.c b/sys/dev/mii/ciphy.c
index 03a71d528349..86567c004715 100644
--- a/sys/dev/mii/ciphy.c
+++ b/sys/dev/mii/ciphy.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2004
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/mii/ciphyreg.h b/sys/dev/mii/ciphyreg.h
index 2822ac18704c..8c0a8a46cc61 100644
--- a/sys/dev/mii/ciphyreg.h
+++ b/sys/dev/mii/ciphyreg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2004
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/mii/dcphy.c b/sys/dev/mii/dcphy.c
index 28affb81063c..ddf9b7e2a605 100644
--- a/sys/dev/mii/dcphy.c
+++ b/sys/dev/mii/dcphy.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/mii/e1000phy.c b/sys/dev/mii/e1000phy.c
index 2dc1448988a0..7894e95f06be 100644
--- a/sys/dev/mii/e1000phy.c
+++ b/sys/dev/mii/e1000phy.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Principal Author: Parag Patel
* Copyright (c) 2001
* All rights reserved.
diff --git a/sys/dev/mii/e1000phyreg.h b/sys/dev/mii/e1000phyreg.h
index bdfc665f8901..14bf6124e69a 100644
--- a/sys/dev/mii/e1000phyreg.h
+++ b/sys/dev/mii/e1000phyreg.h
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* Principal Author: Parag Patel
* Copyright (c) 2001
* All rights reserved.
@@ -30,7 +30,7 @@
* Secondary Author: Matthew Jacob
*/
-/*
+/*-
* Derived by information released by Intel under the following license:
*
* Copyright (c) 1999 - 2001, Intel Corporation
diff --git a/sys/dev/mii/exphy.c b/sys/dev/mii/exphy.c
index 914577289fd9..afb90137388b 100644
--- a/sys/dev/mii/exphy.c
+++ b/sys/dev/mii/exphy.c
@@ -37,7 +37,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-/*
+/*-
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/mii/lxtphy.c b/sys/dev/mii/lxtphy.c
index db5c1002d757..e4d0c1916748 100644
--- a/sys/dev/mii/lxtphy.c
+++ b/sys/dev/mii/lxtphy.c
@@ -38,7 +38,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-/*
+/*-
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/mii/mii.h b/sys/dev/mii/mii.h
index 963c22617722..0f1a4426e6fe 100644
--- a/sys/dev/mii/mii.h
+++ b/sys/dev/mii/mii.h
@@ -1,6 +1,6 @@
/* $NetBSD: mii.h,v 1.9 2001/05/31 03:07:14 thorpej Exp $ */
-/*
+/*-
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
*
* Modification to match BSD/OS 3.0 MII interface by Jason R. Thorpe,
diff --git a/sys/dev/mii/mlphy.c b/sys/dev/mii/mlphy.c
index ecb84f776979..9b2693314ba5 100644
--- a/sys/dev/mii/mlphy.c
+++ b/sys/dev/mii/mlphy.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/mii/nsgphy.c b/sys/dev/mii/nsgphy.c
index 8c74a39bb4e7..259739e15a81 100644
--- a/sys/dev/mii/nsgphy.c
+++ b/sys/dev/mii/nsgphy.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 2001
* Bill Paul <wpaul@bsdi.com>. All rights reserved.
diff --git a/sys/dev/mii/nsgphyreg.h b/sys/dev/mii/nsgphyreg.h
index c7680f1e8a3c..44899191715e 100644
--- a/sys/dev/mii/nsgphyreg.h
+++ b/sys/dev/mii/nsgphyreg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 2001
* Bill Paul <wpaul@bsdi.com>. All rights reserved.
diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c
index 70676ddc1e4f..05941492947d 100644
--- a/sys/dev/mii/nsphy.c
+++ b/sys/dev/mii/nsphy.c
@@ -37,7 +37,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-/*
+/*-
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/mii/pnaphy.c b/sys/dev/mii/pnaphy.c
index 50986dc52f5c..6f3ab65a9deb 100644
--- a/sys/dev/mii/pnaphy.c
+++ b/sys/dev/mii/pnaphy.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000 Berkeley Software Design, Inc.
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@osd.bsdi.com>. All rights reserved.
diff --git a/sys/dev/mii/qsphy.c b/sys/dev/mii/qsphy.c
index 2f09eeb3d09b..9c92ed8a5de3 100644
--- a/sys/dev/mii/qsphy.c
+++ b/sys/dev/mii/qsphy.c
@@ -38,7 +38,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-/*
+/*-
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/mii/rgephy.c b/sys/dev/mii/rgephy.c
index 98609db14d26..ad384a93e82e 100644
--- a/sys/dev/mii/rgephy.c
+++ b/sys/dev/mii/rgephy.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/mii/rgephyreg.h b/sys/dev/mii/rgephyreg.h
index 1adecf4611cb..0ce44dfcd9ac 100644
--- a/sys/dev/mii/rgephyreg.h
+++ b/sys/dev/mii/rgephyreg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c
index 2e93373d84bf..f9c9b5e3102c 100644
--- a/sys/dev/mii/rlphy.c
+++ b/sys/dev/mii/rlphy.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/mii/tdkphy.c b/sys/dev/mii/tdkphy.c
index c5efb691683b..8ae7b0506d01 100644
--- a/sys/dev/mii/tdkphy.c
+++ b/sys/dev/mii/tdkphy.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000,2001 Jonathan Chen.
* All rights reserved.
*
diff --git a/sys/dev/mii/tdkphyreg.h b/sys/dev/mii/tdkphyreg.h
index 1f106251b607..4429c9481ec7 100644
--- a/sys/dev/mii/tdkphyreg.h
+++ b/sys/dev/mii/tdkphyreg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000,2001 Jonathan Chen.
* All rights reserved.
*
diff --git a/sys/dev/mii/tlphy.c b/sys/dev/mii/tlphy.c
index ff00a4708312..f07e33e16c43 100644
--- a/sys/dev/mii/tlphy.c
+++ b/sys/dev/mii/tlphy.c
@@ -37,7 +37,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-/*
+/*-
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/mii/tlphyreg.h b/sys/dev/mii/tlphyreg.h
index 77e4a45700bd..a016f4cc6910 100644
--- a/sys/dev/mii/tlphyreg.h
+++ b/sys/dev/mii/tlphyreg.h
@@ -1,6 +1,6 @@
/* $NetBSD: tlphyreg.h,v 1.1 1998/08/10 23:59:58 thorpej Exp $ */
-/*
+/*-
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/mii/ukphy.c b/sys/dev/mii/ukphy.c
index c75bd6cfa820..2d87b565c241 100644
--- a/sys/dev/mii/ukphy.c
+++ b/sys/dev/mii/ukphy.c
@@ -37,7 +37,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-/*
+/*-
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/mii/xmphy.c b/sys/dev/mii/xmphy.c
index 1270c42c154a..c6d2ee9b383a 100644
--- a/sys/dev/mii/xmphy.c
+++ b/sys/dev/mii/xmphy.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/mii/xmphyreg.h b/sys/dev/mii/xmphyreg.h
index e06b1970831e..1e828e1681a1 100644
--- a/sys/dev/mii/xmphyreg.h
+++ b/sys/dev/mii/xmphyreg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/mpt/mpilib/fc_log.h b/sys/dev/mpt/mpilib/fc_log.h
index 2b02a9ac95b3..fd68bf645931 100644
--- a/sys/dev/mpt/mpilib/fc_log.h
+++ b/sys/dev/mpt/mpilib/fc_log.h
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 2000, 2001 by LSI Logic Corporation
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/mpt/mpilib/mpi.h b/sys/dev/mpt/mpilib/mpi.h
index a3fab3c2aeb9..1044d8205ca7 100644
--- a/sys/dev/mpt/mpilib/mpi.h
+++ b/sys/dev/mpt/mpilib/mpi.h
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 2000, 2001 by LSI Logic Corporation
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/mpt/mpilib/mpi_cnfg.h b/sys/dev/mpt/mpilib/mpi_cnfg.h
index 6008f4227771..356aee748696 100644
--- a/sys/dev/mpt/mpilib/mpi_cnfg.h
+++ b/sys/dev/mpt/mpilib/mpi_cnfg.h
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 2000, 2001 by LSI Logic Corporation
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/mpt/mpilib/mpi_fc.h b/sys/dev/mpt/mpilib/mpi_fc.h
index 60487e139d69..470d385ed5ab 100644
--- a/sys/dev/mpt/mpilib/mpi_fc.h
+++ b/sys/dev/mpt/mpilib/mpi_fc.h
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 2000, 2001 by LSI Logic Corporation
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/mpt/mpilib/mpi_init.h b/sys/dev/mpt/mpilib/mpi_init.h
index 78545889f819..527b1f9ab7e5 100644
--- a/sys/dev/mpt/mpilib/mpi_init.h
+++ b/sys/dev/mpt/mpilib/mpi_init.h
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 2000, 2001 by LSI Logic Corporation
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/mpt/mpilib/mpi_ioc.h b/sys/dev/mpt/mpilib/mpi_ioc.h
index e2e8f43fe81e..a8f8d3e1bc7e 100644
--- a/sys/dev/mpt/mpilib/mpi_ioc.h
+++ b/sys/dev/mpt/mpilib/mpi_ioc.h
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 2000, 2001 by LSI Logic Corporation
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/mpt/mpilib/mpi_lan.h b/sys/dev/mpt/mpilib/mpi_lan.h
index 0c2a137b3517..ceaf353a54e7 100644
--- a/sys/dev/mpt/mpilib/mpi_lan.h
+++ b/sys/dev/mpt/mpilib/mpi_lan.h
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 2000, 2001 by LSI Logic Corporation
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/mpt/mpilib/mpi_raid.h b/sys/dev/mpt/mpilib/mpi_raid.h
index c78a600b64a5..196f1ba00d6a 100644
--- a/sys/dev/mpt/mpilib/mpi_raid.h
+++ b/sys/dev/mpt/mpilib/mpi_raid.h
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 2000, 2001 by LSI Logic Corporation
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/mpt/mpilib/mpi_targ.h b/sys/dev/mpt/mpilib/mpi_targ.h
index f212c62d13dc..ba8b2ca7b553 100644
--- a/sys/dev/mpt/mpilib/mpi_targ.h
+++ b/sys/dev/mpt/mpilib/mpi_targ.h
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 2000, 2001 by LSI Logic Corporation
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/mpt/mpilib/mpi_type.h b/sys/dev/mpt/mpilib/mpi_type.h
index becf1a0747c4..c10cb92bbc8d 100644
--- a/sys/dev/mpt/mpilib/mpi_type.h
+++ b/sys/dev/mpt/mpilib/mpi_type.h
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 2000, 2001 by LSI Logic Corporation
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/mpt/mpt.h b/sys/dev/mpt/mpt.h
index 82e8cf518752..8161d2412575 100644
--- a/sys/dev/mpt/mpt.h
+++ b/sys/dev/mpt/mpt.h
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* Generic defines for LSI '909 FC adapters.
* FreeBSD Version.
*
diff --git a/sys/dev/mpt/mpt_freebsd.h b/sys/dev/mpt/mpt_freebsd.h
index 991e56e5e6bd..49e6f4e0c371 100644
--- a/sys/dev/mpt/mpt_freebsd.h
+++ b/sys/dev/mpt/mpt_freebsd.h
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/*
+/*-
* LSI MPT Host Adapter FreeBSD Wrapper Definitions (CAM version)
*
* Copyright (c) 2000, 2001 by Greg Ansley, Adam Prewett
diff --git a/sys/dev/my/if_myreg.h b/sys/dev/my/if_myreg.h
index ccc7338a9eb7..9d889d12acef 100644
--- a/sys/dev/my/if_myreg.h
+++ b/sys/dev/my/if_myreg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2002 Myson Technology Inc.
* All rights reserved.
*
diff --git a/sys/dev/ncv/ncr53c500.c b/sys/dev/ncv/ncr53c500.c
index dbb8ea9df3a7..346c09aebda8 100644
--- a/sys/dev/ncv/ncr53c500.c
+++ b/sys/dev/ncv/ncr53c500.c
@@ -5,7 +5,7 @@
#define NCV_STATICS
#define NCV_IO_CONTROL_FLAGS (0)
-/*
+/*-
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1995, 1996, 1997, 1998, 1999, 2000, 2001
* NetBSD/pc98 porting staff. All rights reserved.
diff --git a/sys/dev/ncv/ncr53c500_pccard.c b/sys/dev/ncv/ncr53c500_pccard.c
index 1e97372aa263..fddb9e2fe04d 100644
--- a/sys/dev/ncv/ncr53c500_pccard.c
+++ b/sys/dev/ncv/ncr53c500_pccard.c
@@ -1,7 +1,7 @@
/* $NecBSD: ncr53c500_pisa.c,v 1.28 1998/11/26 01:59:11 honda Exp $ */
/* $NetBSD$ */
-/*
+/*-
* [Ported for FreeBSD]
* Copyright (c) 2000
* Noriaki Mitsunaga, Mitsuru Iwasaki and Takanori Watanabe.
diff --git a/sys/dev/ncv/ncr53c500hw.h b/sys/dev/ncv/ncr53c500hw.h
index cf1228855515..7a4b337b8985 100644
--- a/sys/dev/ncv/ncr53c500hw.h
+++ b/sys/dev/ncv/ncr53c500hw.h
@@ -2,7 +2,7 @@
/* $NecBSD: ncr53c500hw.h,v 1.6.18.1 2001/06/08 06:27:44 honda Exp $ */
/* $NetBSD$ */
-/*
+/*-
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1996, 1997, 1998
* NetBSD/pc98 porting staff. All rights reserved.
diff --git a/sys/dev/ncv/ncr53c500hwtab.h b/sys/dev/ncv/ncr53c500hwtab.h
index 7e16b9e72fbd..47406b1947e4 100644
--- a/sys/dev/ncv/ncr53c500hwtab.h
+++ b/sys/dev/ncv/ncr53c500hwtab.h
@@ -2,7 +2,7 @@
/* $NecBSD: ncr53c500hwtab.h,v 1.2.18.1 2001/06/08 06:27:44 honda Exp $ */
/* $NetBSD$ */
-/*
+/*-
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1996, 1997, 1998
* NetBSD/pc98 porting staff. All rights reserved.
diff --git a/sys/dev/ncv/ncr53c500reg.h b/sys/dev/ncv/ncr53c500reg.h
index 0296c5eae004..2a9906e44cdf 100644
--- a/sys/dev/ncv/ncr53c500reg.h
+++ b/sys/dev/ncv/ncr53c500reg.h
@@ -2,7 +2,7 @@
/* $NecBSD: ncr53c500reg.h,v 1.5.14.1 2001/06/08 06:27:44 honda Exp $ */
/* $NetBSD$ */
-/*
+/*-
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1995, 1996, 1997, 1998
* NetBSD/pc98 porting staff. All rights reserved.
diff --git a/sys/dev/ncv/ncr53c500var.h b/sys/dev/ncv/ncr53c500var.h
index 6d5edce9cae7..b3aff4660f0d 100644
--- a/sys/dev/ncv/ncr53c500var.h
+++ b/sys/dev/ncv/ncr53c500var.h
@@ -2,7 +2,7 @@
/* $NecBSD: ncr53c500var.h,v 1.11.18.1 2001/06/08 06:27:45 honda Exp $ */
/* $NetBSD$ */
-/*
+/*-
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1995, 1996, 1997, 1998, 1999, 2000, 2001
* NetBSD/pc98 porting staff. All rights reserved.
diff --git a/sys/dev/nge/if_nge.c b/sys/dev/nge/if_nge.c
index 070e177482a2..1958301546be 100644
--- a/sys/dev/nge/if_nge.c
+++ b/sys/dev/nge/if_nge.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2000, 2001
* Bill Paul <wpaul@bsdi.com>. All rights reserved.
diff --git a/sys/dev/nge/if_ngereg.h b/sys/dev/nge/if_ngereg.h
index e27359fc8645..5a46aa64038a 100644
--- a/sys/dev/nge/if_ngereg.h
+++ b/sys/dev/nge/if_ngereg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2000, 2001
* Bill Paul <wpaul@bsdi.com>. All rights reserved.
diff --git a/sys/dev/nmdm/nmdm.c b/sys/dev/nmdm/nmdm.c
index 41a8704305d4..933f9cb1a9ef 100644
--- a/sys/dev/nmdm/nmdm.c
+++ b/sys/dev/nmdm/nmdm.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/dev/nsp/nsp.c b/sys/dev/nsp/nsp.c
index 954d1bb98898..d955ff2938b2 100644
--- a/sys/dev/nsp/nsp.c
+++ b/sys/dev/nsp/nsp.c
@@ -8,7 +8,7 @@
NSP_READ_FIFO_INTERRUPTS | NSP_WRITE_FIFO_INTERRUPTS | \
NSP_USE_MEMIO | NSP_WAIT_FOR_SELECT)
-/*
+/*-
* Copyright (c) 1998, 1999, 2000, 2001
* NetBSD/pc98 porting staff. All rights reserved.
*
diff --git a/sys/dev/nsp/nsp_pccard.c b/sys/dev/nsp/nsp_pccard.c
index 4c61b07d122d..3be1cdbba059 100644
--- a/sys/dev/nsp/nsp_pccard.c
+++ b/sys/dev/nsp/nsp_pccard.c
@@ -1,7 +1,7 @@
/* $NecBSD: nsp_pisa.c,v 1.4 1999/04/15 01:35:54 kmatsuda Exp $ */
/* $NetBSD$ */
-/*
+/*-
* [Ported for FreeBSD]
* Copyright (c) 2000
* Noriaki Mitsunaga, Mitsuru Iwasaki and Takanori Watanabe.
diff --git a/sys/dev/nsp/nspreg.h b/sys/dev/nsp/nspreg.h
index 3bfcd9696bcf..81512c91a609 100644
--- a/sys/dev/nsp/nspreg.h
+++ b/sys/dev/nsp/nspreg.h
@@ -2,7 +2,7 @@
/* $NecBSD: nspreg.h,v 1.4.14.3 2001/06/29 06:27:53 honda Exp $ */
/* $NetBSD$ */
-/*
+/*-
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1998
* NetBSD/pc98 porting staff. All rights reserved.
diff --git a/sys/dev/nsp/nspvar.h b/sys/dev/nsp/nspvar.h
index 57614084834f..59af783ade02 100644
--- a/sys/dev/nsp/nspvar.h
+++ b/sys/dev/nsp/nspvar.h
@@ -2,7 +2,7 @@
/* $NecBSD: nspvar.h,v 1.7.14.5 2001/06/29 06:27:54 honda Exp $ */
/* $NetBSD$ */
-/*
+/*-
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1998, 1999, 2000, 2001
* NetBSD/pc98 porting staff. All rights reserved.
diff --git a/sys/dev/ofw/ofw_bus_if.m b/sys/dev/ofw/ofw_bus_if.m
index 87e4fcc41e28..edeee5f655b0 100644
--- a/sys/dev/ofw/ofw_bus_if.m
+++ b/sys/dev/ofw/ofw_bus_if.m
@@ -1,3 +1,4 @@
+#-
# Copyright (c) 2001, 2003 by Thomas Moestl <tmm@FreeBSD.org>
# Copyright (c) 2004 by Marius Strobl <marius@FreeBSD.org>
# All rights reserved.
diff --git a/sys/dev/ofw/ofw_console.c b/sys/dev/ofw/ofw_console.c
index 5b3b2854434e..12a86541a64f 100644
--- a/sys/dev/ofw/ofw_console.c
+++ b/sys/dev/ofw/ofw_console.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (C) 2001 Benno Rice.
* All rights reserved.
*
diff --git a/sys/dev/ofw/ofw_disk.c b/sys/dev/ofw/ofw_disk.c
index fa6ef22ca537..2ba3f594813a 100644
--- a/sys/dev/ofw/ofw_disk.c
+++ b/sys/dev/ofw/ofw_disk.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (C) 2002 Benno Rice <benno@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/ofw/openfirm.c b/sys/dev/ofw/openfirm.c
index db87a4a2da5c..f7ef330597b3 100644
--- a/sys/dev/ofw/openfirm.c
+++ b/sys/dev/ofw/openfirm.c
@@ -1,6 +1,6 @@
/* $NetBSD: Locore.c,v 1.7 2000/08/20 07:04:59 tsubai Exp $ */
-/*
+/*-
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
* Copyright (C) 1995, 1996 TooLs GmbH.
* All rights reserved.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-/*
+/*-
* Copyright (C) 2000 Benno Rice.
* All rights reserved.
*
diff --git a/sys/dev/ofw/openfirm.h b/sys/dev/ofw/openfirm.h
index acbaad741564..28b95b339761 100644
--- a/sys/dev/ofw/openfirm.h
+++ b/sys/dev/ofw/openfirm.h
@@ -1,6 +1,6 @@
/* $NetBSD: openfirm.h,v 1.1 1998/05/15 10:16:00 tsubai Exp $ */
-/*
+/*-
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
* Copyright (C) 1995, 1996 TooLs GmbH.
* All rights reserved.
diff --git a/sys/dev/ofw/openfirmio.c b/sys/dev/ofw/openfirmio.c
index b67a1f8fb015..d9272d1145d3 100644
--- a/sys/dev/ofw/openfirmio.c
+++ b/sys/dev/ofw/openfirmio.c
@@ -3,7 +3,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-/*
+/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/dev/ofw/openfirmio.h b/sys/dev/ofw/openfirmio.h
index c4f21d2897a4..bb020262ccba 100644
--- a/sys/dev/ofw/openfirmio.h
+++ b/sys/dev/ofw/openfirmio.h
@@ -1,6 +1,6 @@
/* $NetBSD: openfirmio.h,v 1.4 2002/09/06 13:23:19 gehenna Exp $ */
-/*
+/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
diff --git a/sys/dev/owi/if_owi.c b/sys/dev/owi/if_owi.c
index c8a1aa8693dd..b33da65059cf 100644
--- a/sys/dev/owi/if_owi.c
+++ b/sys/dev/owi/if_owi.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/owi/if_owi_pccard.c b/sys/dev/owi/if_owi_pccard.c
index 1720820a453d..e51bda006144 100644
--- a/sys/dev/owi/if_owi_pccard.c
+++ b/sys/dev/owi/if_owi_pccard.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/owi/if_wireg.h b/sys/dev/owi/if_wireg.h
index 04de3b3538ce..697463fffcad 100644
--- a/sys/dev/owi/if_wireg.h
+++ b/sys/dev/owi/if_wireg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/owi/if_wivar.h b/sys/dev/owi/if_wivar.h
index 98f197069fd1..a439949e5916 100644
--- a/sys/dev/owi/if_wivar.h
+++ b/sys/dev/owi/if_wivar.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2002
* M Warner Losh <imp@freebsd.org>. All rights reserved.
* Copyright (c) 1997, 1998, 1999
diff --git a/sys/dev/patm/genrtab/genrtab.c b/sys/dev/patm/genrtab/genrtab.c
index eef0749fc8c4..8d696cfa8ef6 100644
--- a/sys/dev/patm/genrtab/genrtab.c
+++ b/sys/dev/patm/genrtab/genrtab.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
* All rights reserved.
diff --git a/sys/dev/patm/idt77252reg.h b/sys/dev/patm/idt77252reg.h
index c970568f6ac3..13013a2f1056 100644
--- a/sys/dev/patm/idt77252reg.h
+++ b/sys/dev/patm/idt77252reg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
* All rights reserved.
diff --git a/sys/dev/patm/if_patm.c b/sys/dev/patm/if_patm.c
index 900d1fa7161a..ac01b9586e54 100644
--- a/sys/dev/patm/if_patm.c
+++ b/sys/dev/patm/if_patm.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
* All rights reserved.
diff --git a/sys/dev/patm/if_patm_attach.c b/sys/dev/patm/if_patm_attach.c
index dd4a52d0e335..f7847250d2ae 100644
--- a/sys/dev/patm/if_patm_attach.c
+++ b/sys/dev/patm/if_patm_attach.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
* All rights reserved.
diff --git a/sys/dev/patm/if_patm_intr.c b/sys/dev/patm/if_patm_intr.c
index a8f1c3b0a8a7..f17725395d85 100644
--- a/sys/dev/patm/if_patm_intr.c
+++ b/sys/dev/patm/if_patm_intr.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
* All rights reserved.
diff --git a/sys/dev/patm/if_patm_ioctl.c b/sys/dev/patm/if_patm_ioctl.c
index 359d447cec48..6dc669d99ff3 100644
--- a/sys/dev/patm/if_patm_ioctl.c
+++ b/sys/dev/patm/if_patm_ioctl.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
* All rights reserved.
diff --git a/sys/dev/patm/if_patm_rx.c b/sys/dev/patm/if_patm_rx.c
index a008b3563a59..01c32435fb7f 100644
--- a/sys/dev/patm/if_patm_rx.c
+++ b/sys/dev/patm/if_patm_rx.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
* All rights reserved.
diff --git a/sys/dev/patm/if_patm_tx.c b/sys/dev/patm/if_patm_tx.c
index 112251627f56..0c6a99e185a9 100644
--- a/sys/dev/patm/if_patm_tx.c
+++ b/sys/dev/patm/if_patm_tx.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
* All rights reserved.
diff --git a/sys/dev/patm/if_patmvar.h b/sys/dev/patm/if_patmvar.h
index f26cf17132e5..5cadbc3522da 100644
--- a/sys/dev/patm/if_patmvar.h
+++ b/sys/dev/patm/if_patmvar.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
* All rights reserved.
diff --git a/sys/dev/pccard/card_if.m b/sys/dev/pccard/card_if.m
index 40c429eac148..5328bc6daf0f 100644
--- a/sys/dev/pccard/card_if.m
+++ b/sys/dev/pccard/card_if.m
@@ -1,4 +1,4 @@
-#
+#-
# Copyright (c) 1999 M. Warner Losh.
# All rights reserved.
#
diff --git a/sys/dev/pccard/pccard.c b/sys/dev/pccard/pccard.c
index 3509a8c0690c..020f89494f12 100644
--- a/sys/dev/pccard/pccard.c
+++ b/sys/dev/pccard/pccard.c
@@ -1,6 +1,6 @@
/* $NetBSD: pcmcia.c,v 1.23 2000/07/28 19:17:02 drochner Exp $ */
-/*
+/*-
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/pccard/pccard_cis.c b/sys/dev/pccard/pccard_cis.c
index 99ec42780503..2fa88efd17cb 100644
--- a/sys/dev/pccard/pccard_cis.c
+++ b/sys/dev/pccard/pccard_cis.c
@@ -1,7 +1,7 @@
/* $NetBSD: pcmcia_cis.c,v 1.17 2000/02/10 09:01:52 chopps Exp $ */
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/pccard/pccard_cis.h b/sys/dev/pccard/pccard_cis.h
index 9c8221cacbe1..d6b9c3899f86 100644
--- a/sys/dev/pccard/pccard_cis.h
+++ b/sys/dev/pccard/pccard_cis.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/pccard/pccard_cis_quirks.c b/sys/dev/pccard/pccard_cis_quirks.c
index 7e7bf519fa35..e465e381c741 100644
--- a/sys/dev/pccard/pccard_cis_quirks.c
+++ b/sys/dev/pccard/pccard_cis_quirks.c
@@ -5,7 +5,7 @@ __FBSDID("$FreeBSD$");
#define PCCARDDEBUG
-/*
+/*-
* Copyright (c) 1998 Marc Horowitz. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/pccard/pccarddevs b/sys/dev/pccard/pccarddevs
index 93214e260a26..d56df29a92e1 100644
--- a/sys/dev/pccard/pccarddevs
+++ b/sys/dev/pccard/pccarddevs
@@ -3,7 +3,7 @@ $FreeBSD$
/* $OpenBSD: pcmciadevs,v 1.93 2002/06/21 08:31:10 henning Exp $ */
/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
+ * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
diff --git a/sys/dev/pccard/pccardreg.h b/sys/dev/pccard/pccardreg.h
index f6f67f8dba80..e0f6647771bc 100644
--- a/sys/dev/pccard/pccardreg.h
+++ b/sys/dev/pccard/pccardreg.h
@@ -1,7 +1,7 @@
/* $NetBSD: pcmciareg.h,v 1.7 1998/10/29 09:45:52 enami Exp $ */
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/pccard/pccardvar.h b/sys/dev/pccard/pccardvar.h
index e6aa22f6b383..37835e2bbebb 100644
--- a/sys/dev/pccard/pccardvar.h
+++ b/sys/dev/pccard/pccardvar.h
@@ -1,7 +1,7 @@
/* $NetBSD: pcmciavar.h,v 1.12 2000/02/08 12:51:31 enami Exp $ */
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/pccard/power_if.m b/sys/dev/pccard/power_if.m
index d661d5c5ccd9..a85fd01e50e0 100644
--- a/sys/dev/pccard/power_if.m
+++ b/sys/dev/pccard/power_if.m
@@ -1,4 +1,4 @@
-#
+#-
# Copyright (c) 1999 M. Warner Losh.
# All rights reserved.
#
diff --git a/sys/dev/pccbb/pccbb.c b/sys/dev/pccbb/pccbb.c
index 418696e2bc2a..d142f1949d37 100644
--- a/sys/dev/pccbb/pccbb.c
+++ b/sys/dev/pccbb/pccbb.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2002-2004 M. Warner Losh.
* Copyright (c) 2000-2001 Jonathan Chen.
* All rights reserved.
@@ -7,27 +7,26 @@
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions, and the following disclaimer,
- * without modification, immediately at the beginning of the file.
+ * notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
*/
-/*
+/*-
* Copyright (c) 1998, 1999 and 2000
* HAYAKAWA Koichi. All rights reserved.
*
diff --git a/sys/dev/pccbb/pccbb_isa.c b/sys/dev/pccbb/pccbb_isa.c
index 9d5818e25865..13025a615d2a 100644
--- a/sys/dev/pccbb/pccbb_isa.c
+++ b/sys/dev/pccbb/pccbb_isa.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2002-2004 M. Warner Losh.
* All rights reserved.
*
@@ -6,18 +6,16 @@
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions, and the following disclaimer,
- * without modification, immediately at the beginning of the file.
+ * notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
diff --git a/sys/dev/pccbb/pccbb_pci.c b/sys/dev/pccbb/pccbb_pci.c
index b3c1363c90de..490aed792f27 100644
--- a/sys/dev/pccbb/pccbb_pci.c
+++ b/sys/dev/pccbb/pccbb_pci.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2002-2004 M. Warner Losh.
* Copyright (c) 2000-2001 Jonathan Chen.
* All rights reserved.
@@ -7,27 +7,26 @@
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions, and the following disclaimer,
- * without modification, immediately at the beginning of the file.
+ * notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
*/
-/*
+/*-
* Copyright (c) 1998, 1999 and 2000
* HAYAKAWA Koichi. All rights reserved.
*
diff --git a/sys/dev/pccbb/pccbbdevid.h b/sys/dev/pccbb/pccbbdevid.h
index 73df7aa50e88..c395eb693c30 100644
--- a/sys/dev/pccbb/pccbbdevid.h
+++ b/sys/dev/pccbb/pccbbdevid.h
@@ -1,27 +1,26 @@
-/*
+/*-
* Copyright (c) 2001-2004 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
* 1. Redistributions of source code must retain the above copyright
- * notice immediately at the beginning of the file, without modification,
- * this list of conditions, and the following disclaimer.
+ * notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
*
* $FreeBSD$
*/
diff --git a/sys/dev/pccbb/pccbbreg.h b/sys/dev/pccbb/pccbbreg.h
index fddf46739cf6..4b33c873f177 100644
--- a/sys/dev/pccbb/pccbbreg.h
+++ b/sys/dev/pccbb/pccbbreg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000,2001 Jonathan Chen.
* All rights reserved.
*
@@ -6,18 +6,16 @@
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions, and the following disclaimer,
- * without modification, immediately at the beginning of the file.
+ * notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
diff --git a/sys/dev/pccbb/pccbbvar.h b/sys/dev/pccbb/pccbbvar.h
index 75458af7398b..455f7643efd2 100644
--- a/sys/dev/pccbb/pccbbvar.h
+++ b/sys/dev/pccbb/pccbbvar.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003-2004 Warner Losh.
* Copyright (c) 2000,2001 Jonathan Chen.
* All rights reserved.
@@ -7,18 +7,16 @@
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions, and the following disclaimer,
- * without modification, immediately at the beginning of the file.
+ * notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
diff --git a/sys/dev/pci/pci_if.m b/sys/dev/pci/pci_if.m
index 635005dc1bcb..107746b25f0a 100644
--- a/sys/dev/pci/pci_if.m
+++ b/sys/dev/pci/pci_if.m
@@ -1,4 +1,4 @@
-#
+#-
# Copyright (c) 1998 Doug Rabson
# All rights reserved.
#
diff --git a/sys/dev/pci/pci_private.h b/sys/dev/pci/pci_private.h
index 041e8e306d14..fdeeaaab2bae 100644
--- a/sys/dev/pci/pci_private.h
+++ b/sys/dev/pci/pci_private.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
* Copyright (c) 2000, Michael Smith <msmith@freebsd.org>
* Copyright (c) 2000, BSDi
diff --git a/sys/dev/pci/pcib_if.m b/sys/dev/pci/pcib_if.m
index 1ea253800563..c9f480e701a3 100644
--- a/sys/dev/pci/pcib_if.m
+++ b/sys/dev/pci/pcib_if.m
@@ -1,4 +1,4 @@
-#
+#-
# Copyright (c) 2000 Doug Rabson
# All rights reserved.
#
diff --git a/sys/dev/pci/pcireg.h b/sys/dev/pci/pcireg.h
index 9f0f612848ec..b4de6fd741c5 100644
--- a/sys/dev/pci/pcireg.h
+++ b/sys/dev/pci/pcireg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h
index 38eaa1d8c2cc..75bc8d3f9e4d 100644
--- a/sys/dev/pci/pcivar.h
+++ b/sys/dev/pci/pcivar.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/pdq/pdq.c b/sys/dev/pdq/pdq.c
index 5a658854a4ca..9fb29ad3cdf8 100644
--- a/sys/dev/pdq/pdq.c
+++ b/sys/dev/pdq/pdq.c
@@ -1579,7 +1579,7 @@ pdq_initialize(
p = (pdq_uint8_t *) PDQ_OS_MEMALLOC_CONTIG(contig_bytes);
if (p == NULL)
- printf("%s() - PDQ_OS_MEMALLOC_CONTIG() failed!\n", __FUNCTION__);
+ printf("%s() - PDQ_OS_MEMALLOC_CONTIG() failed!\n", __func__);
if (p != NULL) {
pdq_physaddr_t physaddr = PDQ_OS_VA_TO_BUSPA(pdq, p);
diff --git a/sys/dev/ppbus/lpt.c b/sys/dev/ppbus/lpt.c
index 3b978d7a9873..251f56e594fb 100644
--- a/sys/dev/ppbus/lpt.c
+++ b/sys/dev/ppbus/lpt.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1990 William F. Jolitz, TeleMuse
* All rights reserved.
*
diff --git a/sys/dev/ppbus/lptio.h b/sys/dev/ppbus/lptio.h
index 8458bc6bd357..e8471d396d20 100644
--- a/sys/dev/ppbus/lptio.h
+++ b/sys/dev/ppbus/lptio.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (C) 1994 Geoffrey M. Rehmet
*
* This program is free software; you may redistribute it and/or
diff --git a/sys/dev/ppbus/pcfclock.c b/sys/dev/ppbus/pcfclock.c
index 58bbf2c36e0a..0a650552aece 100644
--- a/sys/dev/ppbus/pcfclock.c
+++ b/sys/dev/ppbus/pcfclock.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000 Sascha Schumann. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/ppbus/ppbus_if.m b/sys/dev/ppbus/ppbus_if.m
index f21dd837568b..ccc308d23f36 100644
--- a/sys/dev/ppbus/ppbus_if.m
+++ b/sys/dev/ppbus/ppbus_if.m
@@ -1,4 +1,4 @@
-#
+#-
# Copyright (c) 1999 Nicolas Souchu
# All rights reserved.
#
diff --git a/sys/dev/ppbus/pps.c b/sys/dev/ppbus/pps.c
index 033d1fef0a56..bf7c08b41ece 100644
--- a/sys/dev/ppbus/pps.c
+++ b/sys/dev/ppbus/pps.c
@@ -1,4 +1,4 @@
-/*
+/*-
* ----------------------------------------------------------------------------
* "THE BEER-WARE LICENSE" (Revision 42):
* <phk@FreeBSD.org> wrote this file. As long as you retain this notice you
diff --git a/sys/dev/ppc/ppcvar.h b/sys/dev/ppc/ppcvar.h
index ad3f74cd316f..9bef9080aa7a 100644
--- a/sys/dev/ppc/ppcvar.h
+++ b/sys/dev/ppc/ppcvar.h
@@ -1,4 +1,3 @@
-
/*-
* Copyright (c) 1997-2000 Nicolas Souchu
* Copyright (c) 2001 Alcove - Nicolas Souchu
diff --git a/sys/dev/puc/puc.c b/sys/dev/puc/puc.c
index e3f192c4dbc4..52a0d5245c13 100644
--- a/sys/dev/puc/puc.c
+++ b/sys/dev/puc/puc.c
@@ -8,25 +8,25 @@
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
- * notice unmodified, this list of conditions, and the following
- * disclaimer.
+ * notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
*/
-/*
+/*-
* Copyright (c) 1996, 1998, 1999
* Christopher G. Demetriou. All rights reserved.
*
diff --git a/sys/dev/puc/puc_ebus.c b/sys/dev/puc/puc_ebus.c
index c7ddeb40153e..12ac8766c8b8 100644
--- a/sys/dev/puc/puc_ebus.c
+++ b/sys/dev/puc/puc_ebus.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/puc/puc_pci.c b/sys/dev/puc/puc_pci.c
index b4c0cf4ecc69..7d876de81e60 100644
--- a/sys/dev/puc/puc_pci.c
+++ b/sys/dev/puc/puc_pci.c
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-/*
+/*-
* Copyright (c) 1996, 1998, 1999
* Christopher G. Demetriou. All rights reserved.
*
diff --git a/sys/dev/puc/puc_sbus.c b/sys/dev/puc/puc_sbus.c
index 3d2e7d67a81a..44abd0bccd95 100644
--- a/sys/dev/puc/puc_sbus.c
+++ b/sys/dev/puc/puc_sbus.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/puc/pucdata.c b/sys/dev/puc/pucdata.c
index 24cfcc199e32..ebfbe3952cbc 100644
--- a/sys/dev/puc/pucdata.c
+++ b/sys/dev/puc/pucdata.c
@@ -1,6 +1,6 @@
/* $NetBSD: pucdata.c,v 1.25 2001/12/16 22:23:01 thorpej Exp $ */
-/*
+/*-
* Copyright (c) 1998, 1999 Christopher G. Demetriou. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/puc/pucvar.h b/sys/dev/puc/pucvar.h
index f0dbe585f813..bf9bb7f4f5d0 100644
--- a/sys/dev/puc/pucvar.h
+++ b/sys/dev/puc/pucvar.h
@@ -9,25 +9,25 @@
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
- * notice unmodified, this list of conditions, and the following
- * disclaimer.
+ * notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
*/
-/*
+/*-
* Copyright (c) 1998, 1999 Christopher G. Demetriou. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/ray/if_ray.c b/sys/dev/ray/if_ray.c
index 36e4c2a71054..04e6c074b667 100644
--- a/sys/dev/ray/if_ray.c
+++ b/sys/dev/ray/if_ray.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (C) 2000
* Dr. Duncan McLennan Barclay, dmlb@ragnet.demon.co.uk.
*
diff --git a/sys/dev/ray/if_raydbg.h b/sys/dev/ray/if_raydbg.h
index 2ab5310c91d9..4981da6b85fe 100644
--- a/sys/dev/ray/if_raydbg.h
+++ b/sys/dev/ray/if_raydbg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (C) 2000
* Dr. Duncan McLennan Barclay, dmlb@ragnet.demon.co.uk.
*
diff --git a/sys/dev/ray/if_raymib.h b/sys/dev/ray/if_raymib.h
index c8ce2551f240..de3bb1641131 100644
--- a/sys/dev/ray/if_raymib.h
+++ b/sys/dev/ray/if_raymib.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (C) 2000
* Dr. Duncan McLennan Barclay, dmlb@ragnet.demon.co.uk.
*
diff --git a/sys/dev/ray/if_rayreg.h b/sys/dev/ray/if_rayreg.h
index cff653f6d0fb..562279f7aa3d 100644
--- a/sys/dev/ray/if_rayreg.h
+++ b/sys/dev/ray/if_rayreg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (C) 2000
* Dr. Duncan McLennan Barclay, dmlb@ragnet.demon.co.uk.
*
diff --git a/sys/dev/ray/if_rayvar.h b/sys/dev/ray/if_rayvar.h
index 09430e3526b3..1cb9b969f1b7 100644
--- a/sys/dev/ray/if_rayvar.h
+++ b/sys/dev/ray/if_rayvar.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (C) 2000
* Dr. Duncan McLennan Barclay, dmlb@ragnet.demon.co.uk.
*
diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c
index ddb0d4273cbc..3e51c7b7d8c9 100644
--- a/sys/dev/rc/rc.c
+++ b/sys/dev/rc/rc.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (C) 1995 by Pavel Antonov, Moscow, Russia.
* Copyright (C) 1995 by Andrey A. Chernov, Moscow, Russia.
* Copyright (C) 2002 by John Baldwin <jhb@FreeBSD.org>
diff --git a/sys/dev/rc/rcreg.h b/sys/dev/rc/rcreg.h
index 321222ed26de..8ba287e7251c 100644
--- a/sys/dev/rc/rcreg.h
+++ b/sys/dev/rc/rcreg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (C) 1995 by Pavel Antonov, Moscow, Russia.
* Copyright (C) 1995 by Andrey A. Chernov, Moscow, Russia.
* Copyright (C) 2002 by John Baldwin <jhb@FreeBSD.org>
diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c
index acef4e95c9b4..039633257d1b 100644
--- a/sys/dev/re/if_re.c
+++ b/sys/dev/re/if_re.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, 1998-2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/rndtest/rndtest.c b/sys/dev/rndtest/rndtest.c
index 1912f92262d4..15ddcceeb59c 100644
--- a/sys/dev/rndtest/rndtest.c
+++ b/sys/dev/rndtest/rndtest.c
@@ -1,6 +1,6 @@
/* $OpenBSD$ */
-/*
+/*-
* Copyright (c) 2002 Jason L. Wright (jason@thought.net)
* All rights reserved.
*
diff --git a/sys/dev/rndtest/rndtest.h b/sys/dev/rndtest/rndtest.h
index 93b7eb8f1291..5a284e9a91de 100644
--- a/sys/dev/rndtest/rndtest.h
+++ b/sys/dev/rndtest/rndtest.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* $OpenBSD$ */
-/*
+/*-
* Copyright (c) 2002 Jason L. Wright (jason@thought.net)
* All rights reserved.
*
diff --git a/sys/dev/rp/rp.c b/sys/dev/rp/rp.c
index da32de86ae08..ceb22adcbb83 100644
--- a/sys/dev/rp/rp.c
+++ b/sys/dev/rp/rp.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) Comtrol Corporation <support@comtrol.com>
* All rights reserved.
*
diff --git a/sys/dev/rp/rp_isa.c b/sys/dev/rp/rp_isa.c
index 9cb567786afb..ebefe4f8b3ad 100644
--- a/sys/dev/rp/rp_isa.c
+++ b/sys/dev/rp/rp_isa.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) Comtrol Corporation <support@comtrol.com>
* All rights reserved.
*
diff --git a/sys/dev/rp/rpreg.h b/sys/dev/rp/rpreg.h
index 1122ace5fb9a..7ab041d3ccb8 100644
--- a/sys/dev/rp/rpreg.h
+++ b/sys/dev/rp/rpreg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) Comtrol Corporation <support@comtrol.com>
* All rights reserved.
*
diff --git a/sys/dev/rp/rpvar.h b/sys/dev/rp/rpvar.h
index 89b4a2f55127..d0a9427618fb 100644
--- a/sys/dev/rp/rpvar.h
+++ b/sys/dev/rp/rpvar.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) Comtrol Corporation <support@comtrol.com>
* All rights reserved.
*
diff --git a/sys/dev/sab/sab.c b/sys/dev/sab/sab.c
index 0b39f0dc3583..c6dfc2246fd6 100644
--- a/sys/dev/sab/sab.c
+++ b/sys/dev/sab/sab.c
@@ -1,6 +1,6 @@
/* $OpenBSD: sab.c,v 1.7 2002/04/08 17:49:42 jason Exp $ */
-/*
+/*-
* Copyright (c) 2001 Jason L. Wright (jason@thought.net)
* All rights reserved.
*
diff --git a/sys/dev/sab/sab82532reg.h b/sys/dev/sab/sab82532reg.h
index 8b53371972de..77e48216357f 100644
--- a/sys/dev/sab/sab82532reg.h
+++ b/sys/dev/sab/sab82532reg.h
@@ -1,6 +1,6 @@
/* $OpenBSD: sab82532reg.h,v 1.2 2002/04/08 17:49:42 jason Exp $ */
-/*
+/*-
* Copyright (c) 2001 Jason L. Wright (jason@thought.net)
* All rights reserved.
*
diff --git a/sys/dev/sbni/if_sbni.c b/sys/dev/sbni/if_sbni.c
index 27ebcae4ca27..c5228b318484 100644
--- a/sys/dev/sbni/if_sbni.c
+++ b/sys/dev/sbni/if_sbni.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997-2001 Granch, Ltd. All rights reserved.
* Author: Denis I.Timofeev <timofeev@granch.ru>
*
diff --git a/sys/dev/sbni/if_sbni_isa.c b/sys/dev/sbni/if_sbni_isa.c
index 0cd88ba696be..956882aeaf99 100644
--- a/sys/dev/sbni/if_sbni_isa.c
+++ b/sys/dev/sbni/if_sbni_isa.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997-2001 Granch, Ltd. All rights reserved.
* Author: Denis I.Timofeev <timofeev@granch.ru>
*
diff --git a/sys/dev/sbni/if_sbnireg.h b/sys/dev/sbni/if_sbnireg.h
index 70fca443051b..4fec30c62f1f 100644
--- a/sys/dev/sbni/if_sbnireg.h
+++ b/sys/dev/sbni/if_sbnireg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997-2001 Granch, Ltd. All rights reserved.
* Author: Denis I.Timofeev <timofeev@granch.ru>
*
diff --git a/sys/dev/sbni/if_sbnivar.h b/sys/dev/sbni/if_sbnivar.h
index 8668a6050870..0fe2f09568b9 100644
--- a/sys/dev/sbni/if_sbnivar.h
+++ b/sys/dev/sbni/if_sbnivar.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997-2001 Granch, Ltd. All rights reserved.
* Author: Denis I.Timofeev <timofeev@granch.ru>
*
diff --git a/sys/dev/sbsh/if_sbshreg.h b/sys/dev/sbsh/if_sbshreg.h
index 44404712a952..94cb0aac46c9 100644
--- a/sys/dev/sbsh/if_sbshreg.h
+++ b/sys/dev/sbsh/if_sbshreg.h
@@ -1,4 +1,4 @@
-/**
+/*-
* Granch SBNI16 G.SHDSL Modem driver definitions
* Written by Denis I. Timofeev, 2002-2003.
*
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c
index ad81ab0632b6..409bb8db9881 100644
--- a/sys/dev/si/si.c
+++ b/sys/dev/si/si.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Device driver for Specialix range (SI/XIO) of serial line multiplexors.
*
* Copyright (C) 1990, 1992, 1998 Specialix International,
diff --git a/sys/dev/si/si.h b/sys/dev/si/si.h
index b9576b2554e3..11a653ad909a 100644
--- a/sys/dev/si/si.h
+++ b/sys/dev/si/si.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Device driver for Specialix range (SI/XIO) of serial line multiplexors.
* 'C' definitions for Specialix serial multiplex driver.
*
diff --git a/sys/dev/si/si2_z280.c b/sys/dev/si/si2_z280.c
index 84179dd8d1ab..6caaf3d577a3 100644
--- a/sys/dev/si/si2_z280.c
+++ b/sys/dev/si/si2_z280.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (C) 1998 Specialix International.
*
* Download code for SI/XIO/SX host cards.
diff --git a/sys/dev/si/si3_t225.c b/sys/dev/si/si3_t225.c
index 16a928902a98..17980075a658 100644
--- a/sys/dev/si/si3_t225.c
+++ b/sys/dev/si/si3_t225.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (C) 1998 Specialix International.
*
* Download code for SI/XIO/SX host cards.
diff --git a/sys/dev/si/si_eisa.c b/sys/dev/si/si_eisa.c
index 6be3c87af6be..edb0a8ef0359 100644
--- a/sys/dev/si/si_eisa.c
+++ b/sys/dev/si/si_eisa.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Device driver for Specialix range (SI/XIO) of serial line multiplexors.
*
* Copyright (C) 2000, Peter Wemm <peter@netplex.com.au>
diff --git a/sys/dev/si/si_isa.c b/sys/dev/si/si_isa.c
index 91cc6e869a9c..5758a8391d4b 100644
--- a/sys/dev/si/si_isa.c
+++ b/sys/dev/si/si_isa.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Device driver for Specialix range (SI/XIO) of serial line multiplexors.
*
* Copyright (C) 2000, Peter Wemm <peter@netplex.com.au>
diff --git a/sys/dev/si/sireg.h b/sys/dev/si/sireg.h
index 0d59ea9fff62..4b4ef6ad6063 100644
--- a/sys/dev/si/sireg.h
+++ b/sys/dev/si/sireg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Device driver for Specialix range (SI/XIO) of serial line multiplexors.
* 'C' definitions for Specialix serial multiplex driver.
*
diff --git a/sys/dev/si/sivar.h b/sys/dev/si/sivar.h
index 4232e76c8019..042355132ad5 100644
--- a/sys/dev/si/sivar.h
+++ b/sys/dev/si/sivar.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Device driver for Specialix range (SI/XIO) of serial line multiplexors.
*
* Copyright (C) 2000, Peter Wemm <peter@netplex.com.au>
diff --git a/sys/dev/sio/sio_isa.c b/sys/dev/sio/sio_isa.c
index 137f47ecde5f..40541e662521 100644
--- a/sys/dev/sio/sio_isa.c
+++ b/sys/dev/sio/sio_isa.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/sio/sio_pccard.c b/sys/dev/sio/sio_pccard.c
index cafb143eddd7..713393a87097 100644
--- a/sys/dev/sio/sio_pccard.c
+++ b/sys/dev/sio/sio_pccard.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/smbus/smbus_if.m b/sys/dev/smbus/smbus_if.m
index 781a15961292..6b213e1f4c23 100644
--- a/sys/dev/smbus/smbus_if.m
+++ b/sys/dev/smbus/smbus_if.m
@@ -1,4 +1,4 @@
-#
+#-
# Copyright (c) 1998 Nicolas Souchu
# All rights reserved.
#
diff --git a/sys/dev/sn/if_sn.c b/sys/dev/sn/if_sn.c
index ed8fcbb8dc8b..07cefd566776 100644
--- a/sys/dev/sn/if_sn.c
+++ b/sys/dev/sn/if_sn.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1996 Gardner Buchanan <gbuchanan@shl.com>
* All rights reserved.
*
diff --git a/sys/dev/sn/if_sn_isa.c b/sys/dev/sn/if_sn_isa.c
index f88f3385d28b..7907f744764c 100644
--- a/sys/dev/sn/if_sn_isa.c
+++ b/sys/dev/sn/if_sn_isa.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 M. Warner Losh
* All rights reserved.
*
diff --git a/sys/dev/sn/if_snreg.h b/sys/dev/sn/if_snreg.h
index 55dba1def772..3f5efd01f5a7 100644
--- a/sys/dev/sn/if_snreg.h
+++ b/sys/dev/sn/if_snreg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1996 Gardner Buchanan <gbuchanan@shl.com>
* All rights reserved.
*
diff --git a/sys/dev/sn/if_snvar.h b/sys/dev/sn/if_snvar.h
index 284b43f85dbf..91c6d8a5b596 100644
--- a/sys/dev/sn/if_snvar.h
+++ b/sys/dev/sn/if_snvar.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 M. Warner Losh <imp@village.org>
* All rights reserved.
*
diff --git a/sys/dev/snc/dp83932.c b/sys/dev/snc/dp83932.c
index 582b77094db0..1ffd4f15cd9c 100644
--- a/sys/dev/snc/dp83932.c
+++ b/sys/dev/snc/dp83932.c
@@ -2,7 +2,7 @@
/* $NecBSD: dp83932.c,v 1.5 1999/07/29 05:08:44 kmatsuda Exp $ */
/* $NetBSD: if_snc.c,v 1.18 1998/04/25 21:27:40 scottr Exp $ */
-/*
+/*-
* Copyright (c) 1997, 1998, 1999
* Kouichi Matsuda. All rights reserved.
*
@@ -45,7 +45,7 @@
* (64 * 16 bits) Microwire Serial EEPROM.
*/
-/*
+/*-
* National Semiconductor DP8393X SONIC Driver
* Copyright (c) 1991 Algorithmics Ltd (http://www.algor.co.uk)
* You may use, copy, and modify this program so long as you retain the
diff --git a/sys/dev/snc/dp83932reg.h b/sys/dev/snc/dp83932reg.h
index b72fe86afc6b..31ab550b83ca 100644
--- a/sys/dev/snc/dp83932reg.h
+++ b/sys/dev/snc/dp83932reg.h
@@ -2,7 +2,7 @@
/* $NecBSD: dp83932reg.h,v 1.2 1999/02/12 05:50:13 kmatsuda Exp $ */
/* $NetBSD: if_snreg.h,v 1.4 1997/06/15 20:20:12 scottr Exp $ */
-/*
+/*-
* Copyright (c) 1991 Algorithmics Ltd (http://www.algor.co.uk)
* You may use, copy, and modify this program so long as you retain the
* copyright line.
diff --git a/sys/dev/snc/dp83932subr.c b/sys/dev/snc/dp83932subr.c
index 7e4b1d75df54..064cb2c3d614 100644
--- a/sys/dev/snc/dp83932subr.c
+++ b/sys/dev/snc/dp83932subr.c
@@ -1,7 +1,7 @@
/* $NecBSD: dp83932subr.c,v 1.5.6.2 1999/10/09 05:47:23 kmatsuda Exp $ */
/* $NetBSD$ */
-/*
+/*-
* Copyright (c) 1997, 1998, 1999
* Kouichi Matsuda. All rights reserved.
*
diff --git a/sys/dev/snc/dp83932subr.h b/sys/dev/snc/dp83932subr.h
index 78fa636cc890..f5df4f97970f 100644
--- a/sys/dev/snc/dp83932subr.h
+++ b/sys/dev/snc/dp83932subr.h
@@ -1,8 +1,8 @@
/* $FreeBSD$ */
/* $NecBSD: dp83932subr.h,v 1.5 1999/02/02 00:47:25 kmatsuda Exp $ */
/* $NetBSD$ */
-
-/*
+
+/*-
* Copyright (c) 1997, 1998, 1999
* Kouichi Matsuda. All rights reserved.
*
diff --git a/sys/dev/snc/dp83932var.h b/sys/dev/snc/dp83932var.h
index fcc6a2245284..f621397b930d 100644
--- a/sys/dev/snc/dp83932var.h
+++ b/sys/dev/snc/dp83932var.h
@@ -2,12 +2,11 @@
/* $NecBSD: dp83932var.h,v 1.3 1999/01/24 01:39:51 kmatsuda Exp $ */
/* $NetBSD: if_snvar.h,v 1.12 1998/05/01 03:42:47 scottr Exp $ */
-/*
+/*-
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1997, 1998, 1999
* Kouichi Matsuda. All rights reserved.
- */
-/*
+ *
* Copyright (c) 1991 Algorithmics Ltd (http://www.algor.co.uk)
* You may use, copy, and modify this program so long as you retain the
* copyright line.
diff --git a/sys/dev/snc/if_snc.c b/sys/dev/snc/if_snc.c
index 69a6ca60315e..7cbdd804f7ba 100644
--- a/sys/dev/snc/if_snc.c
+++ b/sys/dev/snc/if_snc.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1995, David Greenman
* All rights reserved.
*
diff --git a/sys/dev/snc/if_snc_cbus.c b/sys/dev/snc/if_snc_cbus.c
index 19a0505ded4f..1b9ef3ef5655 100644
--- a/sys/dev/snc/if_snc_cbus.c
+++ b/sys/dev/snc/if_snc_cbus.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1995, David Greenman
* All rights reserved.
*
diff --git a/sys/dev/snc/if_snc_pccard.c b/sys/dev/snc/if_snc_pccard.c
index 1478d26bd307..c22fa756e42f 100644
--- a/sys/dev/snc/if_snc_pccard.c
+++ b/sys/dev/snc/if_snc_pccard.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1995, David Greenman
* All rights reserved.
*
diff --git a/sys/dev/snc/if_sncreg.h b/sys/dev/snc/if_sncreg.h
index 30b0bb755992..888aa4f3ceb3 100644
--- a/sys/dev/snc/if_sncreg.h
+++ b/sys/dev/snc/if_sncreg.h
@@ -2,7 +2,7 @@
/* $NecBSD: if_snreg.h,v 1.3 1999/01/24 01:39:52 kmatsuda Exp $ */
/* $NetBSD$ */
-/*
+/*-
* Copyright (c) 1997, 1998, 1999
* Kouichi Matsuda. All rights reserved.
*
diff --git a/sys/dev/snc/if_sncvar.h b/sys/dev/snc/if_sncvar.h
index 33e39f32a3bf..8b6a75b99812 100644
--- a/sys/dev/snc/if_sncvar.h
+++ b/sys/dev/snc/if_sncvar.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1995, David Greenman
* All rights reserved.
*
diff --git a/sys/dev/snp/snp.c b/sys/dev/snp/snp.c
index 6103a5d651f3..eea89c03aae2 100644
--- a/sys/dev/snp/snp.c
+++ b/sys/dev/snp/snp.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1995 Ugen J.S.Antsilevich
*
* Redistribution and use in source forms, with and without modification,
diff --git a/sys/dev/sound/driver.c b/sys/dev/sound/driver.c
index f9952665b71b..7da109923b16 100644
--- a/sys/dev/sound/driver.c
+++ b/sys/dev/sound/driver.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/isa/ad1816.c b/sys/dev/sound/isa/ad1816.c
index 40e006b36636..f34a5c623f65 100644
--- a/sys/dev/sound/isa/ad1816.c
+++ b/sys/dev/sound/isa/ad1816.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* Copyright Luigi Rizzo, 1997,1998
* Copyright by Hannu Savolainen 1994, 1995
diff --git a/sys/dev/sound/isa/ad1816.h b/sys/dev/sound/isa/ad1816.h
index 078523f1d12e..3fe4a3dc3ff1 100644
--- a/sys/dev/sound/isa/ad1816.h
+++ b/sys/dev/sound/isa/ad1816.h
@@ -1,4 +1,4 @@
-/*
+/*-
* (C) 1997 Luigi Rizzo (luigi@iet.unipi.it)
*
* This file contains information and macro definitions for
diff --git a/sys/dev/sound/isa/es1888.c b/sys/dev/sound/isa/es1888.c
index 22e1bb068629..b8d33cee6afe 100644
--- a/sys/dev/sound/isa/es1888.c
+++ b/sys/dev/sound/isa/es1888.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Doug Rabson
* All rights reserved.
*
diff --git a/sys/dev/sound/isa/ess.c b/sys/dev/sound/isa/ess.c
index 1cf756a28aa5..248aebe833ba 100644
--- a/sys/dev/sound/isa/ess.c
+++ b/sys/dev/sound/isa/ess.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* Copyright 1997,1998 Luigi Rizzo.
*
diff --git a/sys/dev/sound/isa/gusc.c b/sys/dev/sound/isa/gusc.c
index bd88322f484d..cb1b1ade4e9a 100644
--- a/sys/dev/sound/isa/gusc.c
+++ b/sys/dev/sound/isa/gusc.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Seigo Tanimura
* Copyright (c) 1999 Ville-Pertti Keinonen
* All rights reserved.
diff --git a/sys/dev/sound/isa/mss.c b/sys/dev/sound/isa/mss.c
index 3a39569954b9..60b1927380a5 100644
--- a/sys/dev/sound/isa/mss.c
+++ b/sys/dev/sound/isa/mss.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001 George Reid <greid@ukug.uk.freebsd.org>
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* Copyright Luigi Rizzo, 1997,1998
diff --git a/sys/dev/sound/isa/mss.h b/sys/dev/sound/isa/mss.h
index d97c70a14cf2..07ac1484bc06 100644
--- a/sys/dev/sound/isa/mss.h
+++ b/sys/dev/sound/isa/mss.h
@@ -1,4 +1,4 @@
-/*
+/*-
* file: mss.h
*
* (C) 1997 Luigi Rizzo (luigi@iet.unipi.it)
@@ -8,6 +8,34 @@
*
*/
+/*-
+ * Copyright (c) 1999 Doug Rabson
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
/*
*
diff --git a/sys/dev/sound/isa/sb16.c b/sys/dev/sound/isa/sb16.c
index 25ad11c25b7a..58cb46ff5def 100644
--- a/sys/dev/sound/isa/sb16.c
+++ b/sys/dev/sound/isa/sb16.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* Copyright 1997,1998 Luigi Rizzo.
*
diff --git a/sys/dev/sound/isa/sb8.c b/sys/dev/sound/isa/sb8.c
index 53e508c728d1..eefe02544536 100644
--- a/sys/dev/sound/isa/sb8.c
+++ b/sys/dev/sound/isa/sb8.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* Copyright 1997,1998 Luigi Rizzo.
*
diff --git a/sys/dev/sound/isa/sbc.c b/sys/dev/sound/isa/sbc.c
index 7783c084db9c..d41cf1029307 100644
--- a/sys/dev/sound/isa/sbc.c
+++ b/sys/dev/sound/isa/sbc.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Seigo Tanimura
* All rights reserved.
*
diff --git a/sys/dev/sound/isa/sndbuf_dma.c b/sys/dev/sound/isa/sndbuf_dma.c
index 2b980807245e..9e45cde9636d 100644
--- a/sys/dev/sound/isa/sndbuf_dma.c
+++ b/sys/dev/sound/isa/sndbuf_dma.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c
index edfb55b97c1c..6f909ccbb0ed 100644
--- a/sys/dev/sound/pci/als4000.c
+++ b/sys/dev/sound/pci/als4000.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001 Orion Hodson <oho@acm.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/als4000.h b/sys/dev/sound/pci/als4000.h
index a6a67df786bc..00661a039b45 100644
--- a/sys/dev/sound/pci/als4000.h
+++ b/sys/dev/sound/pci/als4000.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001 Orion Hodson <O.Hodson@cs.ucl.ac.uk>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/aureal.c b/sys/dev/sound/pci/aureal.c
index 68bebb30469d..8ff1b4057696 100644
--- a/sys/dev/sound/pci/aureal.c
+++ b/sys/dev/sound/pci/aureal.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/aureal.h b/sys/dev/sound/pci/aureal.h
index d710b2e0ba85..e835c7119fcb 100644
--- a/sys/dev/sound/pci/aureal.h
+++ b/sys/dev/sound/pci/aureal.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c
index 857592af000d..196fb69353dc 100644
--- a/sys/dev/sound/pci/cmi.c
+++ b/sys/dev/sound/pci/cmi.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000 Orion Hodson <O.Hodson@cs.ucl.ac.uk>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/cmireg.h b/sys/dev/sound/pci/cmireg.h
index 9e838a6faad3..5c468b55ed8b 100644
--- a/sys/dev/sound/pci/cmireg.h
+++ b/sys/dev/sound/pci/cmireg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c
index ea9e0fcd33ba..f8da280cb43a 100644
--- a/sys/dev/sound/pci/cs4281.c
+++ b/sys/dev/sound/pci/cs4281.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000 Orion Hodson <O.Hodson@cs.ucl.ac.uk>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/cs4281.h b/sys/dev/sound/pci/cs4281.h
index 68a71e7b7f0a..c7b3799ab89d 100644
--- a/sys/dev/sound/pci/cs4281.h
+++ b/sys/dev/sound/pci/cs4281.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000 Orion Hodson <O.Hodson@cs.ucl.ac.uk>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c
index 5cc205abfcb9..d9823d732e25 100644
--- a/sys/dev/sound/pci/csa.c
+++ b/sys/dev/sound/pci/csa.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Seigo Tanimura
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/csapcm.c b/sys/dev/sound/pci/csapcm.c
index c53647db2dd5..753f518e2502 100644
--- a/sys/dev/sound/pci/csapcm.c
+++ b/sys/dev/sound/pci/csapcm.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Seigo Tanimura
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/ds1-fw.h b/sys/dev/sound/pci/ds1-fw.h
index 72a052a2b9bc..a34d2338954c 100644
--- a/sys/dev/sound/pci/ds1-fw.h
+++ b/sys/dev/sound/pci/ds1-fw.h
@@ -1,4 +1,5 @@
-/* =============================================================================
+/*-
+ * =============================================================================
* Copyright (c) 1997-1999 Yamaha Corporation. All Rights Reserved.
*
* Title:
diff --git a/sys/dev/sound/pci/ds1.c b/sys/dev/sound/pci/ds1.c
index 59890d7fc5fc..fa70de1d149e 100644
--- a/sys/dev/sound/pci/ds1.c
+++ b/sys/dev/sound/pci/ds1.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c
index aeeba4dac1b9..3716cc07ff29 100644
--- a/sys/dev/sound/pci/emu10k1.c
+++ b/sys/dev/sound/pci/emu10k1.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2004 David O'Brien <obrien@FreeBSD.org>
* Copyright (c) 2003 Orlando Bassotto <orlando.bassotto@ieo-research.it>
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c
index 7b9797312065..b23245e9328f 100644
--- a/sys/dev/sound/pci/es137x.c
+++ b/sys/dev/sound/pci/es137x.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Support the ENSONIQ AudioPCI board and Creative Labs SoundBlaster PCI
* boards based on the ES1370, ES1371 and ES1373 chips.
*
diff --git a/sys/dev/sound/pci/es137x.h b/sys/dev/sound/pci/es137x.h
index 076fe3c01a1b..8d9b9915050a 100644
--- a/sys/dev/sound/pci/es137x.h
+++ b/sys/dev/sound/pci/es137x.h
@@ -1,4 +1,4 @@
-/*
+/*-
* This supports the ENSONIQ AudioPCI board based on the ES1370.
*
* Copyright (c) 1998 Joachim Kuebart <joki@kuebart.stuttgart.netsurf.de>
diff --git a/sys/dev/sound/pci/fm801.c b/sys/dev/sound/pci/fm801.c
index f1442e695392..ab11f5739e2f 100644
--- a/sys/dev/sound/pci/fm801.c
+++ b/sys/dev/sound/pci/fm801.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000 Dmitry Dicky diwil@dataart.com
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c
index 8756993d2438..af27f810b8a3 100644
--- a/sys/dev/sound/pci/ich.c
+++ b/sys/dev/sound/pci/ich.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000 Katsurajima Naoto <raven@katsurajima.seya.yokohama.jp>
* Copyright (c) 2001 Cameron Grant <cg@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/sound/pci/ich.h b/sys/dev/sound/pci/ich.h
index 8f6cf68bcb48..be3f3fca3b4a 100644
--- a/sys/dev/sound/pci/ich.h
+++ b/sys/dev/sound/pci/ich.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000 Katsurajima Naoto <raven@katsurajima.seya.yokohama.jp>
* Copyright (c) 2001 Cameron Grant <cg@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/sound/pci/maestro.c b/sys/dev/sound/pci/maestro.c
index 79c1277eb2c8..fb39b22428c1 100644
--- a/sys/dev/sound/pci/maestro.c
+++ b/sys/dev/sound/pci/maestro.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2000 Taku YAMAMOTO <taku@cent.saitama-u.ac.jp>
+ * Copyright (c) 2000-2004 Taku YAMAMOTO <taku@tackymt.homeip.net>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/sound/pci/neomagic-coeff.h b/sys/dev/sound/pci/neomagic-coeff.h
index f6cdecfd2f02..2fec6427ae14 100644
--- a/sys/dev/sound/pci/neomagic-coeff.h
+++ b/sys/dev/sound/pci/neomagic-coeff.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic.c
index 5c4619b8c862..3ed79e5cfb88 100644
--- a/sys/dev/sound/pci/neomagic.c
+++ b/sys/dev/sound/pci/neomagic.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/neomagic.h b/sys/dev/sound/pci/neomagic.h
index be5e7e296498..0b87f99cbf97 100644
--- a/sys/dev/sound/pci/neomagic.h
+++ b/sys/dev/sound/pci/neomagic.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/solo.c b/sys/dev/sound/pci/solo.c
index 5cb0c1395ea8..ed102753c1b8 100644
--- a/sys/dev/sound/pci/solo.c
+++ b/sys/dev/sound/pci/solo.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c
index 8bcc588f3958..f570f0773472 100644
--- a/sys/dev/sound/pci/t4dwave.c
+++ b/sys/dev/sound/pci/t4dwave.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/t4dwave.h b/sys/dev/sound/pci/t4dwave.h
index 67e3e4993501..4a2ec626c508 100644
--- a/sys/dev/sound/pci/t4dwave.h
+++ b/sys/dev/sound/pci/t4dwave.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/via8233.c b/sys/dev/sound/pci/via8233.c
index 851d7725b45d..2c338685837f 100644
--- a/sys/dev/sound/pci/via8233.c
+++ b/sys/dev/sound/pci/via8233.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2002 Orion Hodson <orion@freebsd.org>
* Portions of this code derived from via82c686.c:
* Copyright (c) 2000 David Jones <dej@ox.org>
diff --git a/sys/dev/sound/pci/via8233.h b/sys/dev/sound/pci/via8233.h
index bc6f57aa6208..a38afc96255c 100644
--- a/sys/dev/sound/pci/via8233.h
+++ b/sys/dev/sound/pci/via8233.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2002 Orion Hodson <orion@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/via82c686.c b/sys/dev/sound/pci/via82c686.c
index 9ed693b1e9b2..6a94a1992fe7 100644
--- a/sys/dev/sound/pci/via82c686.c
+++ b/sys/dev/sound/pci/via82c686.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000 David Jones <dej@ox.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/vibes.c b/sys/dev/sound/pci/vibes.c
index 6fd1f8fa1462..801a2edaab63 100644
--- a/sys/dev/sound/pci/vibes.c
+++ b/sys/dev/sound/pci/vibes.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001 Orion Hodson <O.Hodson@cs.ucl.ac.uk>
* All rights reserved.
*
diff --git a/sys/dev/sound/pci/vibes.h b/sys/dev/sound/pci/vibes.h
index 36cbadd66781..d1eac407efbe 100644
--- a/sys/dev/sound/pci/vibes.h
+++ b/sys/dev/sound/pci/vibes.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001 Orion Hodson <O.Hodson@cs.ucl.ac.uk>
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/ac97.c b/sys/dev/sound/pcm/ac97.c
index a6303f93c2fd..e2313661aeef 100644
--- a/sys/dev/sound/pcm/ac97.c
+++ b/sys/dev/sound/pcm/ac97.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/ac97.h b/sys/dev/sound/pcm/ac97.h
index 933281cb8a9e..2d2db4b22f5e 100644
--- a/sys/dev/sound/pcm/ac97.h
+++ b/sys/dev/sound/pcm/ac97.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/ac97_if.m b/sys/dev/sound/pcm/ac97_if.m
index 36c5c19091a6..19f7378d1c6d 100644
--- a/sys/dev/sound/pcm/ac97_if.m
+++ b/sys/dev/sound/pcm/ac97_if.m
@@ -1,3 +1,4 @@
+#-
# KOBJ
#
# Copyright (c) 2000 Cameron Grant <cg@freebsd.org>
diff --git a/sys/dev/sound/pcm/ac97_patch.c b/sys/dev/sound/pcm/ac97_patch.c
index e5e728f8b314..05c73d7553a7 100644
--- a/sys/dev/sound/pcm/ac97_patch.c
+++ b/sys/dev/sound/pcm/ac97_patch.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright 2002 FreeBSD, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/sound/pcm/ac97_patch.h b/sys/dev/sound/pcm/ac97_patch.h
index 740031d2ed3a..d0184c4c6be2 100644
--- a/sys/dev/sound/pcm/ac97_patch.h
+++ b/sys/dev/sound/pcm/ac97_patch.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright 2003 FreeBSD, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c
index 096262c2ccf3..9ca6a3238441 100644
--- a/sys/dev/sound/pcm/buffer.c
+++ b/sys/dev/sound/pcm/buffer.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/buffer.h b/sys/dev/sound/pcm/buffer.h
index 48981b5c4078..7b2bffbe127b 100644
--- a/sys/dev/sound/pcm/buffer.h
+++ b/sys/dev/sound/pcm/buffer.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c
index cf970c7132a7..2948e41c9d2d 100644
--- a/sys/dev/sound/pcm/channel.c
+++ b/sys/dev/sound/pcm/channel.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* Portions Copyright by Luigi Rizzo - 1997-99
* All rights reserved.
diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h
index f2fb5957ae1d..23cd7199f58b 100644
--- a/sys/dev/sound/pcm/channel.h
+++ b/sys/dev/sound/pcm/channel.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/channel_if.m b/sys/dev/sound/pcm/channel_if.m
index 9d8e289509c2..cdc6a3b6f2b3 100644
--- a/sys/dev/sound/pcm/channel_if.m
+++ b/sys/dev/sound/pcm/channel_if.m
@@ -1,3 +1,4 @@
+#-
# KOBJ
#
# Copyright (c) 2000 Cameron Grant <cg@freebsd.org>
diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c
index 64088f95117c..1adc6ceed341 100644
--- a/sys/dev/sound/pcm/dsp.c
+++ b/sys/dev/sound/pcm/dsp.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/dsp.h b/sys/dev/sound/pcm/dsp.h
index 0a42e74ef1c1..0d067ededb1a 100644
--- a/sys/dev/sound/pcm/dsp.h
+++ b/sys/dev/sound/pcm/dsp.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/fake.c b/sys/dev/sound/pcm/fake.c
index 1fd0900bff9f..ba9c4b641303 100644
--- a/sys/dev/sound/pcm/fake.c
+++ b/sys/dev/sound/pcm/fake.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c
index 0ec36df6f80a..5bc7b81ae2b9 100644
--- a/sys/dev/sound/pcm/feeder.c
+++ b/sys/dev/sound/pcm/feeder.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h
index 61d42255d966..1a9c37b751aa 100644
--- a/sys/dev/sound/pcm/feeder.h
+++ b/sys/dev/sound/pcm/feeder.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/feeder_fmt.c b/sys/dev/sound/pcm/feeder_fmt.c
index 59d7edc485f5..7eb66f515fd1 100644
--- a/sys/dev/sound/pcm/feeder_fmt.c
+++ b/sys/dev/sound/pcm/feeder_fmt.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/feeder_if.m b/sys/dev/sound/pcm/feeder_if.m
index a100a6dbf0ea..83c0fb073b53 100644
--- a/sys/dev/sound/pcm/feeder_if.m
+++ b/sys/dev/sound/pcm/feeder_if.m
@@ -1,3 +1,4 @@
+#-
# KOBJ
#
# Copyright (c) 2000 Cameron Grant <cg@freebsd.org>
diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_rate.c
index c3752a0ad7b1..55d51fc1e2dc 100644
--- a/sys/dev/sound/pcm/feeder_rate.c
+++ b/sys/dev/sound/pcm/feeder_rate.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003 Orion Hodson <orion@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c
index f40b4301abd5..fed0fc5a3be5 100644
--- a/sys/dev/sound/pcm/mixer.c
+++ b/sys/dev/sound/pcm/mixer.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/mixer.h b/sys/dev/sound/pcm/mixer.h
index 22bd22aa6c3f..2c8dff753e36 100644
--- a/sys/dev/sound/pcm/mixer.h
+++ b/sys/dev/sound/pcm/mixer.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/mixer_if.m b/sys/dev/sound/pcm/mixer_if.m
index 38d99fbd05df..9bd974ce7d9e 100644
--- a/sys/dev/sound/pcm/mixer_if.m
+++ b/sys/dev/sound/pcm/mixer_if.m
@@ -1,3 +1,4 @@
+#-
# KOBJ
#
# Copyright (c) 2000 Cameron Grant <cg@freebsd.org>
diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c
index c8e63877394c..7113bf1e6d24 100644
--- a/sys/dev/sound/pcm/sndstat.c
+++ b/sys/dev/sound/pcm/sndstat.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c
index 4446b3241e9e..fd4ce76bf80f 100644
--- a/sys/dev/sound/pcm/sound.c
+++ b/sys/dev/sound/pcm/sound.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* (C) 1997 Luigi Rizzo (luigi@iet.unipi.it)
* All rights reserved.
diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h
index f1fd6df23d3e..e4cac240247d 100644
--- a/sys/dev/sound/pcm/sound.h
+++ b/sys/dev/sound/pcm/sound.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
* Copyright by Hannu Savolainen 1995
* All rights reserved.
diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c
index ce67fb1559c4..91a114e65706 100644
--- a/sys/dev/sound/pcm/vchan.c
+++ b/sys/dev/sound/pcm/vchan.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/pcm/vchan.h b/sys/dev/sound/pcm/vchan.h
index 99b0d41399a5..cb9e1c8ea17c 100644
--- a/sys/dev/sound/pcm/vchan.h
+++ b/sys/dev/sound/pcm/vchan.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001 Cameron Grant <cg@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/sound/sbus/apcdmareg.h b/sys/dev/sound/sbus/apcdmareg.h
index 28abd8b16dc6..d4296adbe9fe 100644
--- a/sys/dev/sound/sbus/apcdmareg.h
+++ b/sys/dev/sound/sbus/apcdmareg.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* $OpenBSD: apcdmareg.h,v 1.2 2003/06/02 18:53:18 jason Exp $ */
-/*
+/*-
* Copyright (c) 2001 Jason L. Wright (jason@thought.net)
* All rights reserved.
*
diff --git a/sys/dev/sound/sbus/cs4231.c b/sys/dev/sound/sbus/cs4231.c
index 5a236a6b5f0a..11f6b0806bb2 100644
--- a/sys/dev/sound/sbus/cs4231.c
+++ b/sys/dev/sound/sbus/cs4231.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Jason L. Wright (jason@thought.net)
* Copyright (c) 2004 Pyun YongHyeon
* All rights reserved.
diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c
index 28f4ac54e01c..985ffbf1a121 100644
--- a/sys/dev/sound/usb/uaudio.c
+++ b/sys/dev/sound/usb/uaudio.c
@@ -1,7 +1,7 @@
/* $NetBSD: uaudio.c,v 1.41 2001/01/23 14:04:13 augustss Exp $ */
/* $FreeBSD$: */
-/*
+/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/sound/usb/uaudio.h b/sys/dev/sound/usb/uaudio.h
index 8433c818303f..5542f9d9da1e 100644
--- a/sys/dev/sound/usb/uaudio.h
+++ b/sys/dev/sound/usb/uaudio.h
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 2000-2002 Hiroyuki Aizu <aizu@navi.org>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/sound/usb/uaudio_pcm.c b/sys/dev/sound/usb/uaudio_pcm.c
index cd6366cfd94a..851107eba79e 100644
--- a/sys/dev/sound/usb/uaudio_pcm.c
+++ b/sys/dev/sound/usb/uaudio_pcm.c
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 2000-2002 Hiroyuki Aizu <aizu@navi.org>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/sound/usb/uaudioreg.h b/sys/dev/sound/usb/uaudioreg.h
index 20c87cbe333e..aa2aa5e79018 100644
--- a/sys/dev/sound/usb/uaudioreg.h
+++ b/sys/dev/sound/usb/uaudioreg.h
@@ -1,7 +1,7 @@
-/* $NetBSD: uaudioreg.h,v 1.7 2000/12/28 00:29:58 augustss Exp $ */
+/* $NetBSD: uaudioreg.h,v 1.12 2004/11/05 19:08:29 kent Exp $ */
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c
index 88668a7cb370..033b3393145f 100644
--- a/sys/dev/sr/if_sr.c
+++ b/sys/dev/sr/if_sr.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1996 - 2001 John Hay.
* Copyright (c) 1996 SDL Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/sr/if_sr.h b/sys/dev/sr/if_sr.h
index a55a6d3f6b56..c66f667f0023 100644
--- a/sys/dev/sr/if_sr.h
+++ b/sys/dev/sr/if_sr.h
@@ -1,4 +1,4 @@
-/*
+/*-
* if_sr.h
*
* Copyright (C) 1997-1999 Whistle Communications Inc.
diff --git a/sys/dev/sr/if_sr_isa.c b/sys/dev/sr/if_sr_isa.c
index e9a00764f5ee..510a32b74196 100644
--- a/sys/dev/sr/if_sr_isa.c
+++ b/sys/dev/sr/if_sr_isa.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1996 - 2001 John Hay.
* Copyright (c) 1996 SDL Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/sr/if_sr_pci.c b/sys/dev/sr/if_sr_pci.c
index dd41d74bcf58..389476126660 100644
--- a/sys/dev/sr/if_sr_pci.c
+++ b/sys/dev/sr/if_sr_pci.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1996 - 2001 John Hay.
* Copyright (c) 1996 SDL Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/sr/if_srregs.h b/sys/dev/sr/if_srregs.h
index 3d80b22ea184..16925e6e581e 100644
--- a/sys/dev/sr/if_srregs.h
+++ b/sys/dev/sr/if_srregs.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1995 - 2001 John Hay.
* Copyright (c) 1996 SDL Communications, Inc.
* All rights reserved.
diff --git a/sys/dev/stg/tmc18c30.c b/sys/dev/stg/tmc18c30.c
index 223ed53d6051..c07c4c8b516d 100644
--- a/sys/dev/stg/tmc18c30.c
+++ b/sys/dev/stg/tmc18c30.c
@@ -5,7 +5,7 @@
#define STG_STATICS
#define STG_IO_CONTROL_FLAGS (STG_FIFO_INTERRUPTS | STG_WAIT_FOR_SELECT)
-/*
+/*-
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001
* NetBSD/pc98 porting staff. All rights reserved.
diff --git a/sys/dev/stg/tmc18c30_isa.c b/sys/dev/stg/tmc18c30_isa.c
index b674c2eefc07..40966697dc43 100644
--- a/sys/dev/stg/tmc18c30_isa.c
+++ b/sys/dev/stg/tmc18c30_isa.c
@@ -1,7 +1,7 @@
/* $NecBSD: tmc18c30_pisa.c,v 1.22 1998/11/26 01:59:21 honda Exp $ */
/* $NetBSD$ */
-/*
+/*-
* [Ported for FreeBSD]
* Copyright (c) 2000
* Noriaki Mitsunaga, Mitsuru Iwasaki and Takanori Watanabe.
diff --git a/sys/dev/stg/tmc18c30_pccard.c b/sys/dev/stg/tmc18c30_pccard.c
index 0ea2df0f91b1..67bffd3f40c2 100644
--- a/sys/dev/stg/tmc18c30_pccard.c
+++ b/sys/dev/stg/tmc18c30_pccard.c
@@ -1,7 +1,7 @@
/* $NecBSD: tmc18c30_pisa.c,v 1.22 1998/11/26 01:59:21 honda Exp $ */
/* $NetBSD$ */
-/*
+/*-
* [Ported for FreeBSD]
* Copyright (c) 2000
* Noriaki Mitsunaga, Mitsuru Iwasaki and Takanori Watanabe.
diff --git a/sys/dev/stg/tmc18c30_subr.c b/sys/dev/stg/tmc18c30_subr.c
index 7ffd4d39d349..c2cfd44b42ac 100644
--- a/sys/dev/stg/tmc18c30_subr.c
+++ b/sys/dev/stg/tmc18c30_subr.c
@@ -1,4 +1,4 @@
-/*
+/*-
* [Ported for FreeBSD]
* Copyright (c) 2000
* Noriaki Mitsunaga, Mitsuru Iwasaki and Takanori Watanabe.
diff --git a/sys/dev/stg/tmc18c30reg.h b/sys/dev/stg/tmc18c30reg.h
index 9c84d89bc3a3..93c9940ba649 100644
--- a/sys/dev/stg/tmc18c30reg.h
+++ b/sys/dev/stg/tmc18c30reg.h
@@ -2,7 +2,7 @@
/* $NecBSD: tmc18c30reg.h,v 1.4.24.1 2001/06/08 06:27:50 honda Exp $ */
/* $NetBSD$ */
-/*
+/*-
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1996, 1997, 1998
* NetBSD/pc98 porting staff. All rights reserved.
diff --git a/sys/dev/stg/tmc18c30var.h b/sys/dev/stg/tmc18c30var.h
index d6bc4ac4cc49..69e837fc6786 100644
--- a/sys/dev/stg/tmc18c30var.h
+++ b/sys/dev/stg/tmc18c30var.h
@@ -2,7 +2,7 @@
/* $NecBSD: tmc18c30var.h,v 1.12.18.2 2001/06/13 05:51:23 honda Exp $ */
/* $NetBSD$ */
-/*
+/*-
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001
* NetBSD/pc98 porting staff. All rights reserved.
diff --git a/sys/dev/streams/streams.c b/sys/dev/streams/streams.c
index 1df09523ddee..d271be180d44 100644
--- a/sys/dev/streams/streams.c
+++ b/sys/dev/streams/streams.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Mark Newton
* Copyright (c) 1994 Christos Zoulas
* Copyright (c) 1997 Todd Vierling
diff --git a/sys/dev/sx/cd1865.h b/sys/dev/sx/cd1865.h
index 5056deaeecab..297a415ff698 100644
--- a/sys/dev/sx/cd1865.h
+++ b/sys/dev/sx/cd1865.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Device driver for Specialix I/O8+ multiport serial card.
*
* Copyright 2003 Frank Mayhar <frank@exit.com>
diff --git a/sys/dev/sx/sx.c b/sys/dev/sx/sx.c
index 499529269511..0a7921fb75e3 100644
--- a/sys/dev/sx/sx.c
+++ b/sys/dev/sx/sx.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Device tsfsdriver for Specialix I/O8+ multiport serial card.
*
* Copyright 2003 Frank Mayhar <frank@exit.com>
diff --git a/sys/dev/sx/sx.h b/sys/dev/sx/sx.h
index 109b212f334f..eb36cf5595d7 100644
--- a/sys/dev/sx/sx.h
+++ b/sys/dev/sx/sx.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Device driver for Specialix I/O8+ multiport serial card.
*
* Copyright 2003 Frank Mayhar <frank@exit.com>
diff --git a/sys/dev/sx/sx_pci.c b/sys/dev/sx/sx_pci.c
index 3187caf682ca..49052947791f 100644
--- a/sys/dev/sx/sx_pci.c
+++ b/sys/dev/sx/sx_pci.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Device driver for Specialix I/O8+ multiport serial card.
*
* Copyright 2003 Frank Mayhar <frank@exit.com>
diff --git a/sys/dev/sx/sx_util.c b/sys/dev/sx/sx_util.c
index d9409254d322..0eeb8aeb7549 100644
--- a/sys/dev/sx/sx_util.c
+++ b/sys/dev/sx/sx_util.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Device driver for Specialix I/O8+ multiport serial card.
*
* Copyright 2003 Frank Mayhar <frank@exit.com>
diff --git a/sys/dev/sx/sx_util.h b/sys/dev/sx/sx_util.h
index 582e73be1bb1..57f42c9f7517 100644
--- a/sys/dev/sx/sx_util.h
+++ b/sys/dev/sx/sx_util.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Device driver for Specialix I/O8+ multiport serial card.
*
* Copyright 2003 Frank Mayhar <frank@exit.com>
diff --git a/sys/dev/sx/sxvar.h b/sys/dev/sx/sxvar.h
index 7eea73337abe..fa33e371ec90 100644
--- a/sys/dev/sx/sxvar.h
+++ b/sys/dev/sx/sxvar.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Device driver for Specialix I/O8+ multiport serial card.
*
* Copyright 2003 Frank Mayhar <frank@exit.com>
diff --git a/sys/dev/sym/README.sym b/sys/dev/sym/README.sym
index b4612237e7bf..d310cd4d150f 100644
--- a/sys/dev/sym/README.sym
+++ b/sys/dev/sym/README.sym
@@ -1,4 +1,4 @@
-/*
+/*-
* Device driver optimized for the Symbios/LSI 53C896/53C895A/53C1010
* PCI-SCSI controllers.
*
diff --git a/sys/dev/sym/sym_conf.h b/sys/dev/sym/sym_conf.h
index 4154b6c33bf7..768baa7b10a5 100644
--- a/sys/dev/sym/sym_conf.h
+++ b/sys/dev/sym/sym_conf.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Device driver optimized for the Symbios/LSI 53C896/53C895A/53C1010
* PCI-SCSI controllers.
*
diff --git a/sys/dev/sym/sym_defs.h b/sys/dev/sym/sym_defs.h
index 61caabddc0ae..ad1481f71af3 100644
--- a/sys/dev/sym/sym_defs.h
+++ b/sys/dev/sym/sym_defs.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Device driver optimized for the Symbios/LSI 53C896/53C895A/53C1010
* PCI-SCSI controllers.
*
diff --git a/sys/dev/sym/sym_fw.h b/sys/dev/sym/sym_fw.h
index 65b2838bb3d6..a274bbcee430 100644
--- a/sys/dev/sym/sym_fw.h
+++ b/sys/dev/sym/sym_fw.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Device driver optimized for the Symbios/LSI 53C896/53C895A/53C1010
* PCI-SCSI controllers.
*
diff --git a/sys/dev/sym/sym_fw1.h b/sys/dev/sym/sym_fw1.h
index 96ae523ddc1d..9a43dc431f0d 100644
--- a/sys/dev/sym/sym_fw1.h
+++ b/sys/dev/sym/sym_fw1.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Device driver optimized for the Symbios/LSI 53C896/53C895A/53C1010
* PCI-SCSI controllers.
*
diff --git a/sys/dev/sym/sym_fw2.h b/sys/dev/sym/sym_fw2.h
index 77f8df32d7ec..5ff740aa3cd9 100644
--- a/sys/dev/sym/sym_fw2.h
+++ b/sys/dev/sym/sym_fw2.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Device driver optimized for the Symbios/LSI 53C896/53C895A/53C1010
* PCI-SCSI controllers.
*
diff --git a/sys/dev/tdfx/tdfx_io.h b/sys/dev/tdfx/tdfx_io.h
index 8742fd7341cd..faec61e11771 100644
--- a/sys/dev/tdfx/tdfx_io.h
+++ b/sys/dev/tdfx/tdfx_io.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000-2001 by Coleman Kane <cokane@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/tdfx/tdfx_linux.h b/sys/dev/tdfx/tdfx_linux.h
index fa4351de226f..a3235cc8ba02 100644
--- a/sys/dev/tdfx/tdfx_linux.h
+++ b/sys/dev/tdfx/tdfx_linux.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000-2001 by Coleman Kane <cokane@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/tdfx/tdfx_pci.h b/sys/dev/tdfx/tdfx_pci.h
index 1ecc554e8edc..0c60e5a2b6c1 100644
--- a/sys/dev/tdfx/tdfx_pci.h
+++ b/sys/dev/tdfx/tdfx_pci.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000-2001 by Coleman Kane <cokane@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/tdfx/tdfx_vars.h b/sys/dev/tdfx/tdfx_vars.h
index 95a9bbf9c165..1e10e3c3a669 100644
--- a/sys/dev/tdfx/tdfx_vars.h
+++ b/sys/dev/tdfx/tdfx_vars.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000-2001 by Coleman Kane <cokane@FreeBSD.org>
* All rights reserved.
*
diff --git a/sys/dev/tga/tga_pci.c b/sys/dev/tga/tga_pci.c
index 1477a7c4210a..63f9c5a32b92 100644
--- a/sys/dev/tga/tga_pci.c
+++ b/sys/dev/tga/tga_pci.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/dev/tga/tga_pci.h b/sys/dev/tga/tga_pci.h
index 269913104493..21dc74e37417 100644
--- a/sys/dev/tga/tga_pci.h
+++ b/sys/dev/tga/tga_pci.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
* All rights reserved.
*
diff --git a/sys/dev/trm/trm.c b/sys/dev/trm/trm.c
index 2319828b8d0c..fac2c90dec9b 100644
--- a/sys/dev/trm/trm.c
+++ b/sys/dev/trm/trm.c
@@ -8,7 +8,6 @@
* DC395U2D/U2W(TRM-S2080)
* PCI SCSI Bus Master Host Adapter
* (SCSI chip set used Tekram ASIC TRM-S1040,TRM-S2080)
- *(C)Copyright 1995-2001 Tekram Technology Co.,Ltd.
*/
#include <sys/cdefs.h>
@@ -27,8 +26,8 @@ __FBSDID("$FreeBSD$");
* 1.11 10/13/2001 Oscar Feng Fixed wrong Async speed display bug.
*/
-/*
- *
+/*-
+ * (C)Copyright 1995-2001 Tekram Technology Co.,Ltd.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/sys/dev/trm/trm.h b/sys/dev/trm/trm.h
index e9eadbea8181..21248835a510 100644
--- a/sys/dev/trm/trm.h
+++ b/sys/dev/trm/trm.h
@@ -1,10 +1,12 @@
-/*
+/*-
* File Name : trm.h
*
* Tekram DC395U/UW/F ,DC315/U
* PCI SCSI Bus Master Host Adapter Device Driver
* (SCSI chip set used Tekram ASIC TRM-S1040)
*
+ * (C)Copyright 1995-2001 Tekram Technology Co.,Ltd.
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
diff --git a/sys/dev/txp/3c990img.h b/sys/dev/txp/3c990img.h
index a14441d3ed3c..6e75f5d83cf0 100644
--- a/sys/dev/txp/3c990img.h
+++ b/sys/dev/txp/3c990img.h
@@ -1,7 +1,7 @@
/* $OpenBSD: 3c990img.h,v 1.2 2001/06/05 02:15:17 jason Exp $ */
/* $FreeBSD$ */
-/*
+/*-
* Copyright (C) 1999-2001 3Com, Inc.
* All rights reserved.
*
diff --git a/sys/dev/txp/if_txp.c b/sys/dev/txp/if_txp.c
index 2a7221de4f9f..a2805324ea76 100644
--- a/sys/dev/txp/if_txp.c
+++ b/sys/dev/txp/if_txp.c
@@ -1,6 +1,6 @@
/* $OpenBSD: if_txp.c,v 1.48 2001/06/27 06:34:50 kjc Exp $ */
-/*
+/*-
* Copyright (c) 2001
* Jason L. Wright <jason@thought.net>, Theo de Raadt, and
* Aaron Campbell <aaron@monkey.org>. All rights reserved.
diff --git a/sys/dev/txp/if_txpreg.h b/sys/dev/txp/if_txpreg.h
index 634c29f07f7e..2d88fc9fd053 100644
--- a/sys/dev/txp/if_txpreg.h
+++ b/sys/dev/txp/if_txpreg.h
@@ -1,7 +1,7 @@
/* $OpenBSD: if_txpreg.h,v 1.30 2001/06/23 04:18:02 jason Exp $ */
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 2001 Aaron Campbell <aaron@monkey.org>.
* All rights reserved.
*
diff --git a/sys/dev/uart/uart.h b/sys/dev/uart/uart.h
index 5de4d420ac5c..101304ed6871 100644
--- a/sys/dev/uart/uart.h
+++ b/sys/dev/uart/uart.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_bus.h b/sys/dev/uart/uart_bus.h
index a4eaa12145e1..9fd84e9eca6c 100644
--- a/sys/dev/uart/uart_bus.h
+++ b/sys/dev/uart/uart_bus.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
*
@@ -146,7 +146,6 @@ struct uart_softc {
union {
/* TTY specific data. */
struct {
- struct cdev *si[2]; /* We have 2 device special files. */
struct tty *tp;
} u_tty;
/* Keyboard specific data. */
diff --git a/sys/dev/uart/uart_bus_acpi.c b/sys/dev/uart/uart_bus_acpi.c
index a26357132d04..042dfef5d219 100644
--- a/sys/dev/uart/uart_bus_acpi.c
+++ b/sys/dev/uart/uart_bus_acpi.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/uart/uart_bus_isa.c b/sys/dev/uart/uart_bus_isa.c
index 82dd59a45496..2a9b83c3ab2e 100644
--- a/sys/dev/uart/uart_bus_isa.c
+++ b/sys/dev/uart/uart_bus_isa.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/uart/uart_bus_pccard.c b/sys/dev/uart/uart_bus_pccard.c
index 5f0e02b26bab..a1ca4c2e292c 100644
--- a/sys/dev/uart/uart_bus_pccard.c
+++ b/sys/dev/uart/uart_bus_pccard.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001 M. Warner Losh. All rights reserved.
* Copyright (c) 2003 Norikatsu Shigemura, Takenori Watanabe All rights reserved.
*
diff --git a/sys/dev/uart/uart_bus_pci.c b/sys/dev/uart/uart_bus_pci.c
index 2e4573d4e26b..fb2fc6d1bfe1 100644
--- a/sys/dev/uart/uart_bus_pci.c
+++ b/sys/dev/uart/uart_bus_pci.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/uart/uart_core.c b/sys/dev/uart/uart_core.c
index ca89c5cfd0e3..00fdf1610a39 100644
--- a/sys/dev/uart/uart_core.c
+++ b/sys/dev/uart/uart_core.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_cpu.h b/sys/dev/uart/uart_cpu.h
index 78626339fa14..75e0f6fd73c0 100644
--- a/sys/dev/uart/uart_cpu.h
+++ b/sys/dev/uart/uart_cpu.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003, 2004 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_cpu_alpha.c b/sys/dev/uart/uart_cpu_alpha.c
index 67b49b4f0c50..de2dc00989fa 100644
--- a/sys/dev/uart/uart_cpu_alpha.c
+++ b/sys/dev/uart/uart_cpu_alpha.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003, 2004 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_cpu_amd64.c b/sys/dev/uart/uart_cpu_amd64.c
index 8a32574f0c32..0b32113a80ef 100644
--- a/sys/dev/uart/uart_cpu_amd64.c
+++ b/sys/dev/uart/uart_cpu_amd64.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003, 2004 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_cpu_i386.c b/sys/dev/uart/uart_cpu_i386.c
index 7cf2fd09c089..8ac6d2057ef6 100644
--- a/sys/dev/uart/uart_cpu_i386.c
+++ b/sys/dev/uart/uart_cpu_i386.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003, 2004 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_cpu_ia64.c b/sys/dev/uart/uart_cpu_ia64.c
index 70464567036a..8d3e3de8f422 100644
--- a/sys/dev/uart/uart_cpu_ia64.c
+++ b/sys/dev/uart/uart_cpu_ia64.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003, 2004 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_cpu_pc98.c b/sys/dev/uart/uart_cpu_pc98.c
index 3fc263017afb..f9eb02eac78b 100644
--- a/sys/dev/uart/uart_cpu_pc98.c
+++ b/sys/dev/uart/uart_cpu_pc98.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003 M. Warner Losh, Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_cpu_sparc64.c b/sys/dev/uart/uart_cpu_sparc64.c
index 1496faa8e2a1..14b768e1b057 100644
--- a/sys/dev/uart/uart_cpu_sparc64.c
+++ b/sys/dev/uart/uart_cpu_sparc64.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003, 2004 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_dbg.c b/sys/dev/uart/uart_dbg.c
index 71938b961827..51d9ec59bdde 100644
--- a/sys/dev/uart/uart_dbg.c
+++ b/sys/dev/uart/uart_dbg.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_dev_ns8250.c b/sys/dev/uart/uart_dev_ns8250.c
index 5869d3384eda..3956fe71a0c9 100644
--- a/sys/dev/uart/uart_dev_ns8250.c
+++ b/sys/dev/uart/uart_dev_ns8250.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_dev_sab82532.c b/sys/dev/uart/uart_dev_sab82532.c
index 5d22b4f0b2c7..b943b1d915e0 100644
--- a/sys/dev/uart/uart_dev_sab82532.c
+++ b/sys/dev/uart/uart_dev_sab82532.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_dev_z8530.c b/sys/dev/uart/uart_dev_z8530.c
index b804bec68dba..30b84d5cd174 100644
--- a/sys/dev/uart/uart_dev_z8530.c
+++ b/sys/dev/uart/uart_dev_z8530.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_if.m b/sys/dev/uart/uart_if.m
index 762c16eaa143..0bb145490ed4 100644
--- a/sys/dev/uart/uart_if.m
+++ b/sys/dev/uart/uart_if.m
@@ -1,3 +1,4 @@
+#-
# Copyright (c) 2003 Marcel Moolenaar
# All rights reserved.
#
diff --git a/sys/dev/uart/uart_kbd_sun.h b/sys/dev/uart/uart_kbd_sun.h
index 574e966b7040..603d257432df 100644
--- a/sys/dev/uart/uart_kbd_sun.h
+++ b/sys/dev/uart/uart_kbd_sun.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2002 Jason L. Wright (jason@thought.net)
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_subr.c b/sys/dev/uart/uart_subr.c
index 27dfd41b0735..14ce64b1b84f 100644
--- a/sys/dev/uart/uart_subr.c
+++ b/sys/dev/uart/uart_subr.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/uart/uart_tty.c b/sys/dev/uart/uart_tty.c
index c4d0220195bc..6888ae0d6ba5 100644
--- a/sys/dev/uart/uart_tty.c
+++ b/sys/dev/uart/uart_tty.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
*
diff --git a/sys/dev/ubsec/ubsec.c b/sys/dev/ubsec/ubsec.c
index db3e96c0b2c2..39da78c9f3c8 100644
--- a/sys/dev/ubsec/ubsec.c
+++ b/sys/dev/ubsec/ubsec.c
@@ -1,6 +1,6 @@
/* $OpenBSD: ubsec.c,v 1.115 2002/09/24 18:33:26 jason Exp $ */
-/*
+/*-
* Copyright (c) 2000 Jason L. Wright (jason@thought.net)
* Copyright (c) 2000 Theo de Raadt (deraadt@openbsd.org)
* Copyright (c) 2001 Patrik Lindergren (patrik@ipunplugged.com)
diff --git a/sys/dev/ubsec/ubsecreg.h b/sys/dev/ubsec/ubsecreg.h
index 4be530a02296..2ba1f937d06e 100644
--- a/sys/dev/ubsec/ubsecreg.h
+++ b/sys/dev/ubsec/ubsecreg.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* $OpenBSD: ubsecreg.h,v 1.27 2002/09/11 22:40:31 jason Exp $ */
-/*
+/*-
* Copyright (c) 2000 Theo de Raadt
* Copyright (c) 2001 Patrik Lindergren (patrik@ipunplugged.com)
*
diff --git a/sys/dev/ubsec/ubsecvar.h b/sys/dev/ubsec/ubsecvar.h
index 965a0d90181d..448403b14c01 100644
--- a/sys/dev/ubsec/ubsecvar.h
+++ b/sys/dev/ubsec/ubsecvar.h
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/* $OpenBSD: ubsecvar.h,v 1.35 2002/09/24 18:33:26 jason Exp $ */
-/*
+/*-
* Copyright (c) 2000 Theo de Raadt
* Copyright (c) 2001 Patrik Lindergren (patrik@ipunplugged.com)
*
diff --git a/sys/dev/usb/dsbr100io.h b/sys/dev/usb/dsbr100io.h
index aa53eadd4612..811c3a72b8e2 100644
--- a/sys/dev/usb/dsbr100io.h
+++ b/sys/dev/usb/dsbr100io.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001 M. Warner Losh
* All rights reserved.
*
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c
index c45c9cdb545e..e5279dd8ea0b 100644
--- a/sys/dev/usb/ehci.c
+++ b/sys/dev/usb/ehci.c
@@ -1,6 +1,6 @@
/* $NetBSD: ehci.c,v 1.89 2004/12/03 08:51:31 augustss Exp $ */
-/*
+/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/ehcireg.h b/sys/dev/usb/ehcireg.h
index 2aaa4c8107ad..304b4ae2d92a 100644
--- a/sys/dev/usb/ehcireg.h
+++ b/sys/dev/usb/ehcireg.h
@@ -1,7 +1,7 @@
/* $NetBSD: ehcireg.h,v 1.17 2004/06/23 06:45:56 mycroft Exp $ */
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/ehcivar.h b/sys/dev/usb/ehcivar.h
index 0fec5a761cd7..7859646080c8 100644
--- a/sys/dev/usb/ehcivar.h
+++ b/sys/dev/usb/ehcivar.h
@@ -1,7 +1,7 @@
/* $NetBSD: ehcivar.h,v 1.12 2001/12/31 12:16:57 augustss Exp $ */
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/hid.c b/sys/dev/usb/hid.c
index f083a17cf681..1c1fcbdbbc9d 100644
--- a/sys/dev/usb/hid.c
+++ b/sys/dev/usb/hid.c
@@ -3,7 +3,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-/*
+/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/hid.h b/sys/dev/usb/hid.h
index 590e7cb585c6..a4ab7d2b2969 100644
--- a/sys/dev/usb/hid.h
+++ b/sys/dev/usb/hid.h
@@ -1,7 +1,7 @@
/* $NetBSD: hid.h,v 1.6 2000/06/01 14:28:57 augustss Exp $ */
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/if_auereg.h b/sys/dev/usb/if_auereg.h
index 478ceced0c22..eaa587a6fefc 100644
--- a/sys/dev/usb/if_auereg.h
+++ b/sys/dev/usb/if_auereg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c
index f85ba5aac765..ed8144d7cf05 100644
--- a/sys/dev/usb/if_axe.c
+++ b/sys/dev/usb/if_axe.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, 1998, 1999, 2000-2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/usb/if_axereg.h b/sys/dev/usb/if_axereg.h
index 04fa92df8e51..cea2f46f5b44 100644
--- a/sys/dev/usb/if_axereg.h
+++ b/sys/dev/usb/if_axereg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, 1998, 1999, 2000-2003
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index b7e715a25539..e379428519a0 100644
--- a/sys/dev/usb/if_cue.c
+++ b/sys/dev/usb/if_cue.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/usb/if_cuereg.h b/sys/dev/usb/if_cuereg.h
index beaf1d5a39d1..85fc71e8b45c 100644
--- a/sys/dev/usb/if_cuereg.h
+++ b/sys/dev/usb/if_cuereg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index 1e21d9cc66bf..9a4258bd72c1 100644
--- a/sys/dev/usb/if_kue.c
+++ b/sys/dev/usb/if_kue.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/usb/if_kuereg.h b/sys/dev/usb/if_kuereg.h
index 4fa829516fb9..5ea0226518cd 100644
--- a/sys/dev/usb/if_kuereg.h
+++ b/sys/dev/usb/if_kuereg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c
index c7d3c45c784d..96ef08ffa762 100644
--- a/sys/dev/usb/if_udav.c
+++ b/sys/dev/usb/if_udav.c
@@ -1,7 +1,7 @@
/* $NetBSD: if_udav.c,v 1.2 2003/09/04 15:17:38 tsutsui Exp $ */
/* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 2003
* Shingo WATANABE <nabe@nabechan.org>. All rights reserved.
*
diff --git a/sys/dev/usb/if_udavreg.h b/sys/dev/usb/if_udavreg.h
index 7680422a65e3..965cbdc7cb57 100644
--- a/sys/dev/usb/if_udavreg.h
+++ b/sys/dev/usb/if_udavreg.h
@@ -1,7 +1,7 @@
/* $NetBSD: if_udavreg.h,v 1.2 2003/09/04 15:17:39 tsutsui Exp $ */
/* $nabe: if_udavreg.h,v 1.2 2003/08/21 16:26:40 nabe Exp $ */
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 2003
* Shingo WATANABE <nabe@nabechan.org>. All rights reserved.
*
diff --git a/sys/dev/usb/kue_fw.h b/sys/dev/usb/kue_fw.h
index 8d8c1e1f2f0c..659dc6bb78f3 100644
--- a/sys/dev/usb/kue_fw.h
+++ b/sys/dev/usb/kue_fw.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index 575bafb55eb9..f53cd0e517be 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -15,7 +15,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-/*
+/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/ohcireg.h b/sys/dev/usb/ohcireg.h
index 4c0a6c260703..c255a4b28f34 100644
--- a/sys/dev/usb/ohcireg.h
+++ b/sys/dev/usb/ohcireg.h
@@ -2,7 +2,7 @@
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/ohcivar.h b/sys/dev/usb/ohcivar.h
index 19ec182009c2..f9b05176e0f0 100644
--- a/sys/dev/usb/ohcivar.h
+++ b/sys/dev/usb/ohcivar.h
@@ -1,7 +1,7 @@
/* $NetBSD: ohcivar.h,v 1.30 2001/12/31 12:20:35 augustss Exp $ */
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/rio500_usb.h b/sys/dev/usb/rio500_usb.h
index c2da72e91b11..f2c2081ccc9d 100644
--- a/sys/dev/usb/rio500_usb.h
+++ b/sys/dev/usb/rio500_usb.h
@@ -1,4 +1,5 @@
-/* ----------------------------------------------------------------------
+/*-
+ ----------------------------------------------------------------------
Copyright (C) 2000 Cesar Miquel (miquel@df.uba.ar)
diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c
index 6fe6dc878a34..14e8cec8eeaa 100644
--- a/sys/dev/usb/ubsa.c
+++ b/sys/dev/usb/ubsa.c
@@ -26,7 +26,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-/*
+/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/ubser.c b/sys/dev/usb/ubser.c
index eab35bed9f55..fae841b3c9d7 100644
--- a/sys/dev/usb/ubser.c
+++ b/sys/dev/usb/ubser.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2004 Bernd Walter <ticso@freebsd.org>
*
* $URL: https://devel.bwct.de/svn/projects/ubser/ubser.c $
@@ -33,7 +33,7 @@
* SUCH DAMAGE.
*/
-/*
+/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/ubser.h b/sys/dev/usb/ubser.h
index d1cc2c6b5969..45c7ec558eaa 100644
--- a/sys/dev/usb/ubser.h
+++ b/sys/dev/usb/ubser.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003 Bernd Walter <ticso@freebsd.org>
*
* $URL: https://devel.bwct.de/svn/projects/ubser/ubser.h $
diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c
index 706882880360..f85619563cb2 100644
--- a/sys/dev/usb/ucom.c
+++ b/sys/dev/usb/ucom.c
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-/*
+/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/ucomvar.h b/sys/dev/usb/ucomvar.h
index 818c3245a839..9bddab74cba0 100644
--- a/sys/dev/usb/ucomvar.h
+++ b/sys/dev/usb/ucomvar.h
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
-/*
+/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/udbp.c b/sys/dev/usb/udbp.c
index 2bedbbe092d8..1ad11bccfb56 100644
--- a/sys/dev/usb/udbp.c
+++ b/sys/dev/usb/udbp.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1996-2000 Whistle Communications, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/udbp.h b/sys/dev/usb/udbp.h
index 0b7b4eeae7e0..97ef9455b664 100644
--- a/sys/dev/usb/udbp.h
+++ b/sys/dev/usb/udbp.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1996-2000 Whistle Communications, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/ufm.c b/sys/dev/usb/ufm.c
index 66b7376c43f3..8439abb2cad2 100644
--- a/sys/dev/usb/ufm.c
+++ b/sys/dev/usb/ufm.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2001 M. Warner Losh
* All rights reserved.
*
diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c
index e015f844ef96..0cd0991b51c4 100644
--- a/sys/dev/usb/uftdi.c
+++ b/sys/dev/usb/uftdi.c
@@ -1,6 +1,6 @@
/* $NetBSD: uftdi.c,v 1.13 2002/09/23 05:51:23 simonb Exp $ */
-/*
+/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index 7eea5da6deb7..cc01b161a075 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -10,7 +10,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-/*
+/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/ugraphire_rdesc.h b/sys/dev/usb/ugraphire_rdesc.h
index 9dd6988ab907..295f2a0db785 100644
--- a/sys/dev/usb/ugraphire_rdesc.h
+++ b/sys/dev/usb/ugraphire_rdesc.h
@@ -1,6 +1,6 @@
/* $NetBSD: usb/ugraphire_rdesc.h,v 1.1 2000/12/29 01:47:49 augustss Exp $ */
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 2000 Nick Hibma <n_hibma@freebsd.org>
* All rights reserved.
*
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index bc424d7fcf28..213c6b3d2a67 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -14,7 +14,7 @@
__FBSDID("$FreeBSD$");
-/*
+/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/uhci_pci.c b/sys/dev/usb/uhci_pci.c
index 50b12c75b3fd..3583eae97610 100644
--- a/sys/dev/usb/uhci_pci.c
+++ b/sys/dev/usb/uhci_pci.c
@@ -297,7 +297,7 @@ uhci_pci_attach(device_t self)
uhci_pci_detach(self);
return ENOMEM;
}
- device_set_ivars(sc->sc_bus.bdev, sc);
+ device_set_ivars(sc->sc_bus.bdev, &sc->sc_bus);
/* uhci_pci_match must never return NULL if uhci_pci_probe succeeded */
device_set_desc(sc->sc_bus.bdev, uhci_pci_match(self));
diff --git a/sys/dev/usb/uhcireg.h b/sys/dev/usb/uhcireg.h
index b640e9f9e8aa..512dd2d7d3c0 100644
--- a/sys/dev/usb/uhcireg.h
+++ b/sys/dev/usb/uhcireg.h
@@ -1,7 +1,7 @@
/* $NetBSD: uhcireg.h,v 1.15 2002/02/11 11:41:30 augustss Exp $ */
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/uhcivar.h b/sys/dev/usb/uhcivar.h
index 56709803c788..2ba9d6f06464 100644
--- a/sys/dev/usb/uhcivar.h
+++ b/sys/dev/usb/uhcivar.h
@@ -1,7 +1,7 @@
/* $NetBSD: uhcivar.h,v 1.33 2002/02/11 11:41:30 augustss Exp $ */
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index 4c287af11879..074e7d1ab075 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -7,7 +7,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-/*
+/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c
index 0c07211a659b..88927568362a 100644
--- a/sys/dev/usb/uhub.c
+++ b/sys/dev/usb/uhub.c
@@ -1,6 +1,6 @@
/* $NetBSD: uhub.c,v 1.68 2004/06/29 06:30:05 mycroft Exp $ */
-/*
+/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c
index d1eea00016af..0748ddb21306 100644
--- a/sys/dev/usb/ukbd.c
+++ b/sys/dev/usb/ukbd.c
@@ -1,5 +1,4 @@
-
-/*
+/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index 4be53b3dae8d..9716b65ea9ff 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -1,6 +1,6 @@
/* $NetBSD: ulpt.c,v 1.60 2003/10/04 21:19:50 augustss Exp $ */
-/*
+/*-
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c
index baede276c411..d1ff96c522bc 100644
--- a/sys/dev/usb/umodem.c
+++ b/sys/dev/usb/umodem.c
@@ -29,7 +29,7 @@ __FBSDID("$FreeBSD$");
* SUCH DAMAGE.
*/
-/*
+/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c
index 83440c3ef857..3fad1c799b2a 100644
--- a/sys/dev/usb/ums.c
+++ b/sys/dev/usb/ums.c
@@ -1,5 +1,4 @@
-
-/*
+/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c
index 8ae8a7d6e9f8..04b595c06dbb 100644
--- a/sys/dev/usb/uplcom.c
+++ b/sys/dev/usb/uplcom.c
@@ -1,7 +1,7 @@
/* $NetBSD: uplcom.c,v 1.21 2001/11/13 06:24:56 lukem Exp $ */
/*-
- * Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
+ * Copyright (c) 2001-2003, 2005 Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-/*
+/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c
index f2df650e711b..68efc9c19e54 100644
--- a/sys/dev/usb/urio.c
+++ b/sys/dev/usb/urio.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2000 Iwasa Kazmi
* All rights reserved.
*
@@ -67,9 +67,9 @@ __FBSDID("$FreeBSD$");
#else
#include <sys/select.h>
#endif
-#include <sys/vnode.h>
#include <sys/poll.h>
#include <sys/sysctl.h>
+#include <sys/uio.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 07be320209ca..c6e285264fc3 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -10,7 +10,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-/*
+/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/usb.h b/sys/dev/usb/usb.h
index e5278596f3ce..f4559c1ea633 100644
--- a/sys/dev/usb/usb.h
+++ b/sys/dev/usb/usb.h
@@ -1,7 +1,7 @@
/* $NetBSD: usb.h,v 1.69 2002/09/22 23:20:50 augustss Exp $ */
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/usb_ethersubr.c b/sys/dev/usb/usb_ethersubr.c
index 325f3db48eea..642f94a24119 100644
--- a/sys/dev/usb/usb_ethersubr.c
+++ b/sys/dev/usb/usb_ethersubr.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/usb/usb_ethersubr.h b/sys/dev/usb/usb_ethersubr.h
index c8a40108ef5c..9cd6c7915e7b 100644
--- a/sys/dev/usb/usb_ethersubr.h
+++ b/sys/dev/usb/usb_ethersubr.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/usb/usb_if.m b/sys/dev/usb/usb_if.m
index c1b27c8a4bec..b04c8a45a4c4 100644
--- a/sys/dev/usb/usb_if.m
+++ b/sys/dev/usb/usb_if.m
@@ -1,4 +1,4 @@
-#
+#-
# Copyright (c) 1992-1998 Nick Hibma <n_hibma@freebsd.org>
# All rights reserved.
#
diff --git a/sys/dev/usb/usb_mem.c b/sys/dev/usb/usb_mem.c
index 82b678e82b5c..f9a59eb3c6d9 100644
--- a/sys/dev/usb/usb_mem.c
+++ b/sys/dev/usb/usb_mem.c
@@ -1,7 +1,7 @@
/* $NetBSD: usb_mem.c,v 1.26 2003/02/01 06:23:40 thorpej Exp $ */
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/usb_mem.h b/sys/dev/usb/usb_mem.h
index bba88d582082..6fe63f3e3385 100644
--- a/sys/dev/usb/usb_mem.h
+++ b/sys/dev/usb/usb_mem.h
@@ -1,7 +1,7 @@
/* $NetBSD: usb_mem.h,v 1.18 2002/05/28 17:45:17 augustss Exp $ */
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h
index 38dd65e5aa2e..270a2ad1262d 100644
--- a/sys/dev/usb/usb_port.h
+++ b/sys/dev/usb/usb_port.h
@@ -7,7 +7,7 @@
* $NetBSD: usb_port.h,v 1.58 2002/10/01 01:25:26 thorpej Exp $
*/
-/*
+/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/usb_quirks.c b/sys/dev/usb/usb_quirks.c
index 0c05d54b55a7..4a2e977d6cb5 100644
--- a/sys/dev/usb/usb_quirks.c
+++ b/sys/dev/usb/usb_quirks.c
@@ -1,6 +1,6 @@
/* $NetBSD: usb_quirks.c,v 1.50 2004/06/23 02:30:52 mycroft Exp $ */
-/*
+/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/usb_quirks.h b/sys/dev/usb/usb_quirks.h
index 2a36a0649bab..4977bf605b40 100644
--- a/sys/dev/usb/usb_quirks.h
+++ b/sys/dev/usb/usb_quirks.h
@@ -1,7 +1,7 @@
/* $NetBSD: usb_quirks.h,v 1.20 2001/04/15 09:38:01 augustss Exp $ */
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c
index fa21645137a0..e6fa74ac1dd4 100644
--- a/sys/dev/usb/usb_subr.c
+++ b/sys/dev/usb/usb_subr.c
@@ -12,7 +12,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-/*
+/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/usbcdc.h b/sys/dev/usb/usbcdc.h
index 45266e44302c..305c53cf634a 100644
--- a/sys/dev/usb/usbcdc.h
+++ b/sys/dev/usb/usbcdc.h
@@ -1,7 +1,7 @@
/* $NetBSD: usbcdc.h,v 1.6 2000/04/27 15:26:50 augustss Exp $ */
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 6287a2dce1af..b7331859e186 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,7 +1,8 @@
$FreeBSD$
+/* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */
-/*
- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
+/*-
+ * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c
index b313d8f7c8f8..e5e4fd05c535 100644
--- a/sys/dev/usb/usbdi.c
+++ b/sys/dev/usb/usbdi.c
@@ -3,7 +3,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-/*
+/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/usbdi.h b/sys/dev/usb/usbdi.h
index 4bb41829d5ec..d3dac2e987d6 100644
--- a/sys/dev/usb/usbdi.h
+++ b/sys/dev/usb/usbdi.h
@@ -1,7 +1,7 @@
/* $NetBSD: usbdi.h,v 1.64 2004/10/23 13:26:34 augustss Exp $ */
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/usbdi_util.c b/sys/dev/usb/usbdi_util.c
index 8fdd1cc8f7a9..e18c6d38e9f9 100644
--- a/sys/dev/usb/usbdi_util.c
+++ b/sys/dev/usb/usbdi_util.c
@@ -1,6 +1,6 @@
/* $NetBSD: usbdi_util.c,v 1.36 2001/11/13 06:24:57 lukem Exp $ */
-/*
+/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/usbdi_util.h b/sys/dev/usb/usbdi_util.h
index a6a3646b13a4..51e052f712f8 100644
--- a/sys/dev/usb/usbdi_util.h
+++ b/sys/dev/usb/usbdi_util.h
@@ -1,7 +1,7 @@
/* $NetBSD: usbdi_util.h,v 1.29 2004/06/23 02:30:52 mycroft Exp $ */
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/usbdivar.h b/sys/dev/usb/usbdivar.h
index 4be8d648561e..69f236638b1a 100644
--- a/sys/dev/usb/usbdivar.h
+++ b/sys/dev/usb/usbdivar.h
@@ -1,7 +1,7 @@
/* $NetBSD: usbdivar.h,v 1.70 2002/07/11 21:14:36 augustss Exp $ */
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/usbhid.h b/sys/dev/usb/usbhid.h
index 416aec3f2e56..8e0ecd579907 100644
--- a/sys/dev/usb/usbhid.h
+++ b/sys/dev/usb/usbhid.h
@@ -1,7 +1,7 @@
/* $NetBSD: usbhid.h,v 1.9 2000/09/03 19:09:14 augustss Exp $ */
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c
index 9dfb9f8c4930..ef8e0a3c2b76 100644
--- a/sys/dev/usb/uscanner.c
+++ b/sys/dev/usb/uscanner.c
@@ -7,7 +7,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-/*
+/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/usb/uvisor.c b/sys/dev/usb/uvisor.c
index 68214e775d46..fcce25057543 100644
--- a/sys/dev/usb/uvisor.c
+++ b/sys/dev/usb/uvisor.c
@@ -14,7 +14,7 @@
*/
-/*
+/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
*
diff --git a/sys/dev/utopia/idtphy.h b/sys/dev/utopia/idtphy.h
index dacb2afedef3..1451d0561fa3 100644
--- a/sys/dev/utopia/idtphy.h
+++ b/sys/dev/utopia/idtphy.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
* All rights reserved.
diff --git a/sys/dev/utopia/suni.h b/sys/dev/utopia/suni.h
index ac8e9978fc9c..fd1be7e13e39 100644
--- a/sys/dev/utopia/suni.h
+++ b/sys/dev/utopia/suni.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
* All rights reserved.
diff --git a/sys/dev/utopia/utopia.c b/sys/dev/utopia/utopia.c
index 263f4b9f20e4..e4a7c01b358f 100644
--- a/sys/dev/utopia/utopia.c
+++ b/sys/dev/utopia/utopia.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
* All rights reserved.
diff --git a/sys/dev/utopia/utopia.h b/sys/dev/utopia/utopia.h
index ae044f98f08d..0c95aa344d4f 100644
--- a/sys/dev/utopia/utopia.h
+++ b/sys/dev/utopia/utopia.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
* All rights reserved.
diff --git a/sys/dev/vge/if_vge.c b/sys/dev/vge/if_vge.c
index 39e44500c7ec..0023d0404b84 100644
--- a/sys/dev/vge/if_vge.c
+++ b/sys/dev/vge/if_vge.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2004
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/vge/if_vgereg.h b/sys/dev/vge/if_vgereg.h
index 9b7e5869e107..8d11a9c3e1f6 100644
--- a/sys/dev/vge/if_vgereg.h
+++ b/sys/dev/vge/if_vgereg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2004
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/vge/if_vgevar.h b/sys/dev/vge/if_vgevar.h
index ad298c49d850..f8003744a7cb 100644
--- a/sys/dev/vge/if_vgevar.h
+++ b/sys/dev/vge/if_vgevar.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2004
* Bill Paul <wpaul@windriver.com>. All rights reserved.
*
diff --git a/sys/dev/vx/if_vx.c b/sys/dev/vx/if_vx.c
index 584196e89bc4..d2d7b25df278 100644
--- a/sys/dev/vx/if_vx.c
+++ b/sys/dev/vx/if_vx.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1994 Herb Peyerl <hpeyerl@novatel.ca>
* All rights reserved.
*
diff --git a/sys/dev/vx/if_vx_eisa.c b/sys/dev/vx/if_vx_eisa.c
index f51c05551036..e53b0ced790b 100644
--- a/sys/dev/vx/if_vx_eisa.c
+++ b/sys/dev/vx/if_vx_eisa.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (C) 1996 Naoki Hamada <nao@tom-yam.or.jp>
* All rights reserved.
*
diff --git a/sys/dev/vx/if_vx_pci.c b/sys/dev/vx/if_vx_pci.c
index 7e22bd496ea8..3f94917cbaa9 100644
--- a/sys/dev/vx/if_vx_pci.c
+++ b/sys/dev/vx/if_vx_pci.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (C) 1996 Naoki Hamada <nao@tom-yam.or.jp>
* All rights reserved.
*
diff --git a/sys/dev/vx/if_vxreg.h b/sys/dev/vx/if_vxreg.h
index 6ee87bd3796b..eec14edbf927 100644
--- a/sys/dev/vx/if_vxreg.h
+++ b/sys/dev/vx/if_vxreg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1993 Herb Peyerl (hpeyerl@novatel.ca) All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/vx/if_vxvar.h b/sys/dev/vx/if_vxvar.h
index e8a7a323eca9..c532d6fba504 100644
--- a/sys/dev/vx/if_vxvar.h
+++ b/sys/dev/vx/if_vxvar.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1993 Herb Peyerl (hpeyerl@novatel.ca) All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/wds/wd7000.c b/sys/dev/wds/wd7000.c
index cf0ad21bf3fc..384dd08be1c3 100644
--- a/sys/dev/wds/wd7000.c
+++ b/sys/dev/wds/wd7000.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1994 Ludd, University of Lule}, Sweden.
* Copyright (c) 2000 Sergey A. Babkin
* All rights reserved.
diff --git a/sys/dev/wi/if_wavelan_ieee.h b/sys/dev/wi/if_wavelan_ieee.h
index d48ba6e6b864..585edaa237fa 100644
--- a/sys/dev/wi/if_wavelan_ieee.h
+++ b/sys/dev/wi/if_wavelan_ieee.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/wi/if_wi.c b/sys/dev/wi/if_wi.c
index 486df5234321..8dd7a25d729e 100644
--- a/sys/dev/wi/if_wi.c
+++ b/sys/dev/wi/if_wi.c
@@ -1,6 +1,6 @@
/* $NetBSD: wi.c,v 1.109 2003/01/09 08:52:19 dyoung Exp $ */
-/*
+/*-
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/wi/if_wi_pccard.c b/sys/dev/wi/if_wi_pccard.c
index 549825b72be3..75355a233613 100644
--- a/sys/dev/wi/if_wi_pccard.c
+++ b/sys/dev/wi/if_wi_pccard.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/wi/if_wi_pci.c b/sys/dev/wi/if_wi_pci.c
index 89c9d97826e6..64cfd1e0ad96 100644
--- a/sys/dev/wi/if_wi_pci.c
+++ b/sys/dev/wi/if_wi_pci.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/wi/if_wireg.h b/sys/dev/wi/if_wireg.h
index 03c6e22de150..7992f891c481 100644
--- a/sys/dev/wi/if_wireg.h
+++ b/sys/dev/wi/if_wireg.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
*
diff --git a/sys/dev/wi/if_wivar.h b/sys/dev/wi/if_wivar.h
index 0a8388e77b7b..e97d31d9183d 100644
--- a/sys/dev/wi/if_wivar.h
+++ b/sys/dev/wi/if_wivar.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2002
* M Warner Losh <imp@freebsd.org>. All rights reserved.
* Copyright (c) 1997, 1998, 1999
diff --git a/sys/dev/wi/spectrum24t_cf.h b/sys/dev/wi/spectrum24t_cf.h
index 7f1d2b023272..ce053fa1930c 100644
--- a/sys/dev/wi/spectrum24t_cf.h
+++ b/sys/dev/wi/spectrum24t_cf.h
@@ -1,7 +1,7 @@
/* $NetBSD$ */
/* $FreeBSD$ */
-/*
+/*-
* Copyright (c) 2001 Symbol Technologies Inc. -- http://www.symbol.com
* All rights reserved.
*
diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c
index 25296b5968c1..113a985d4a75 100644
--- a/sys/dev/wl/if_wl.c
+++ b/sys/dev/wl/if_wl.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
diff --git a/sys/dev/wl/if_wl.h b/sys/dev/wl/if_wl.h
index 7f9c2270ed0e..e883b782b046 100644
--- a/sys/dev/wl/if_wl.h
+++ b/sys/dev/wl/if_wl.h
@@ -1,4 +1,4 @@
-/*
+/*-
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
diff --git a/sys/dev/xe/if_xe.c b/sys/dev/xe/if_xe.c
index c60fa0a60399..a1db1029a61e 100644
--- a/sys/dev/xe/if_xe.c
+++ b/sys/dev/xe/if_xe.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/*
+/*-
* Portions of this software were derived from Werner Koch's xirc2ps driver
* for Linux under the terms of the following license (from v1.30 of the
* xirc2ps driver):
diff --git a/sys/dev/xe/if_xe_pccard.c b/sys/dev/xe/if_xe_pccard.c
index af014b94027f..8d9f7672b7fc 100644
--- a/sys/dev/xe/if_xe_pccard.c
+++ b/sys/dev/xe/if_xe_pccard.c
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2002 Takeshi Shibagaki
* All rights reserved.
*
diff --git a/sys/dev/zs/z8530reg.h b/sys/dev/zs/z8530reg.h
index 9b191d28ba90..b471c9c4deb5 100644
--- a/sys/dev/zs/z8530reg.h
+++ b/sys/dev/zs/z8530reg.h
@@ -1,6 +1,6 @@
/* $NetBSD: z8530reg.h,v 1.8 1996/12/13 21:02:39 gwr Exp $ */
-/*
+/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*