svn commit: r355164 - in head: . share/man/man4 sys/amd64/conf sys/conf sys/dev/trm sys/i386/conf sys/modules sys/modules/trm

[Rodney W. Grimes]

> Author: scottl
> Date: Thu Nov 28 02:32:17 2019
> New Revision: 355164
> URL: https://svnweb.freebsd.org/changeset/base/355164
> 
> Log:
>   Remove the trm(4) driver
>   
>   Differential Revision:	https://reviews.freebsd.org/D22575

Deprecation notice to merge to stable/{12,11}?
Relnotes entry?

> Deleted:
>   head/share/man/man4/trm.4
>   head/sys/dev/trm/
>   head/sys/modules/trm/
> Modified:
>   head/ObsoleteFiles.inc
>   head/share/man/man4/Makefile
>   head/sys/amd64/conf/GENERIC
>   head/sys/conf/NOTES
>   head/sys/conf/files
>   head/sys/i386/conf/GENERIC
>   head/sys/modules/Makefile
> 
> Modified: head/ObsoleteFiles.inc
> ==============================================================================
> --- head/ObsoleteFiles.inc	Thu Nov 28 02:28:12 2019	(r355163)
> +++ head/ObsoleteFiles.inc	Thu Nov 28 02:32:17 2019	(r355164)
> @@ -38,6 +38,8 @@
>  #   xargs -n1 | sort | uniq -d;
>  # done
>  
> +# 20191128: Removal of trm(4)
> +OLD_FILES+=usr/share/man/man4/trm.4.gz
>  # 20191121: Removal of sio(4)
>  OLD_FILES+=usr/share/man/man4/sio.4.gz
>  # 20191105: picobsd(8), et al, removed.
> 
> Modified: head/share/man/man4/Makefile
> ==============================================================================
> --- head/share/man/man4/Makefile	Thu Nov 28 02:28:12 2019	(r355163)
> +++ head/share/man/man4/Makefile	Thu Nov 28 02:32:17 2019	(r355164)
> @@ -522,7 +522,6 @@ MAN=	aac.4 \
>  	ti.4 \
>  	timecounters.4 \
>  	${_tpm.4} \
> -	trm.4 \
>  	tty.4 \
>  	tun.4 \
>  	twa.4 \
> 
> Modified: head/sys/amd64/conf/GENERIC
> ==============================================================================
> --- head/sys/amd64/conf/GENERIC	Thu Nov 28 02:28:12 2019	(r355163)
> +++ head/sys/amd64/conf/GENERIC	Thu Nov 28 02:32:17 2019	(r355164)
> @@ -150,7 +150,6 @@ device		mpt			# LSI-Logic MPT-Fusion
>  device		mps			# LSI-Logic MPT-Fusion 2
>  device		mpr			# LSI-Logic MPT-Fusion 3
>  device		sym			# NCR/Symbios Logic
> -device		trm			# Tekram DC395U/UW/F DC315U adapters
>  device		isci			# Intel C600 SAS controller
>  device		ocs_fc			# Emulex FC adapters
>  device		pvscsi			# VMware PVSCSI
> 
> Modified: head/sys/conf/NOTES
> ==============================================================================
> --- head/sys/conf/NOTES	Thu Nov 28 02:28:12 2019	(r355163)
> +++ head/sys/conf/NOTES	Thu Nov 28 02:32:17 2019	(r355164)
> @@ -1511,7 +1511,6 @@ options		TERMINAL_KERN_ATTR=(FG_LIGHTRED|BG_BLACK)
>  #      53C810, 53C810A, 53C815, 53C825,  53C825A, 53C860, 53C875,
>  #      53C876, 53C885,  53C895, 53C895A, 53C896,  53C897, 53C1510D,
>  #      53C1010-33, 53C1010-66.
> -# trm: Tekram DC395U/UW/F DC315U adapters.
>  
>  device		ahc
>  device		ahd
> @@ -1538,7 +1537,6 @@ device		mpr			# LSI-Logic MPT-Fusion 3
>  device		mps			# LSI-Logic MPT-Fusion 2
>  device		mpt			# LSI-Logic MPT-Fusion
>  device		sym
> -device		trm
>  
>  # The aic7xxx driver will attempt to use memory mapped I/O for all PCI
>  # controllers that have it configured only if this option is set. Unfortunately,
> 
> Modified: head/sys/conf/files
> ==============================================================================
> --- head/sys/conf/files	Thu Nov 28 02:28:12 2019	(r355163)
> +++ head/sys/conf/files	Thu Nov 28 02:32:17 2019	(r355164)
> @@ -3144,7 +3144,6 @@ dev/tcp_log/tcp_log_dev.c	optional tcp_blackbox inet |
>  dev/tdfx/tdfx_linux.c		optional tdfx_linux tdfx compat_linux
>  dev/tdfx/tdfx_pci.c		optional tdfx pci
>  dev/ti/if_ti.c			optional ti pci
> -dev/trm/trm.c			optional trm
>  dev/twa/tw_cl_init.c		optional twa \
>  	compile-with "${NORMAL_C} -I$S/dev/twa"
>  dev/twa/tw_cl_intr.c		optional twa \
> 
> Modified: head/sys/i386/conf/GENERIC
> ==============================================================================
> --- head/sys/i386/conf/GENERIC	Thu Nov 28 02:28:12 2019	(r355163)
> +++ head/sys/i386/conf/GENERIC	Thu Nov 28 02:32:17 2019	(r355164)
> @@ -136,7 +136,6 @@ device		mpt			# LSI-Logic MPT-Fusion
>  device		mps			# LSI-Logic MPT-Fusion 2
>  device		mpr			# LSI-Logic MPT-Fusion 3
>  device		sym			# NCR/Symbios Logic
> -device		trm			# Tekram DC395U/UW/F DC315U adapters
>  device		isci			# Intel C600 SAS controller
>  device		pvscsi			# VMware PVSCSI
>  
> 
> Modified: head/sys/modules/Makefile
> ==============================================================================
> --- head/sys/modules/Makefile	Thu Nov 28 02:28:12 2019	(r355163)
> +++ head/sys/modules/Makefile	Thu Nov 28 02:32:17 2019	(r355164)
> @@ -352,7 +352,6 @@ SUBDIR=	\
>  	tmpfs \
>  	${_toecore} \
>  	${_tpm} \
> -	trm \
>  	${_twa} \
>  	twe \
>  	tws \
> 

-- 
Rod Grimes                                                 rgrimes at freebsd.org