Author: rstone
Date: Tue Oct  1 13:36:01 2019
New Revision: 352926
URL: https://svnweb.freebsd.org/changeset/base/352926

Log:
  Clean up duplicate entries in sys/conf/files
  
  Reviewed by:  imp

Modified:
  head/sys/conf/files

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files Tue Oct  1 08:21:41 2019        (r352925)
+++ head/sys/conf/files Tue Oct  1 13:36:01 2019        (r352926)
@@ -679,7 +679,7 @@ crypto/blowfish/bf_ecb.c    optional ipsec | ipsec_suppor
 crypto/blowfish/bf_skey.c      optional crypto | ipsec | ipsec_support
 crypto/camellia/camellia.c     optional crypto | ipsec | ipsec_support
 crypto/camellia/camellia-api.c optional crypto | ipsec | ipsec_support
-crypto/chacha20/chacha.c       optional crypto | ipsec | ipsec_support
+crypto/chacha20/chacha.c       standard
 crypto/chacha20/chacha-sw.c    optional crypto | ipsec | ipsec_support
 crypto/des/des_ecb.c           optional crypto | ipsec | ipsec_support | netsmb
 crypto/des/des_setkey.c                optional crypto | ipsec | ipsec_support 
| netsmb
@@ -1777,7 +1777,6 @@ dev/iicbus/ds1307.c               optional ds1307
 dev/iicbus/ds13rtc.c           optional ds13rtc | ds133x | ds1374
 dev/iicbus/ds1672.c            optional ds1672
 dev/iicbus/ds3231.c            optional ds3231
-dev/iicbus/rtc8583.c           optional rtc8583
 dev/iicbus/syr827.c            optional syr827 ext_resources fdt
 dev/iicbus/icee.c              optional icee
 dev/iicbus/if_ic.c             optional ic
@@ -3173,11 +3172,9 @@ dev/uart/uart_dev_mvebu.c        optional uart uart_mvebu
 dev/uart/uart_dev_ns8250.c     optional uart uart_ns8250 | uart uart_snps
 dev/uart/uart_dev_pl011.c      optional uart pl011
 dev/uart/uart_dev_quicc.c      optional uart quicc
-dev/uart/uart_dev_sab82532.c   optional uart uart_sab82532
-dev/uart/uart_dev_sab82532.c   optional uart scc
+dev/uart/uart_dev_sab82532.c   optional uart uart_sab82532 | uart scc
 dev/uart/uart_dev_snps.c       optional uart uart_snps fdt
-dev/uart/uart_dev_z8530.c      optional uart uart_z8530
-dev/uart/uart_dev_z8530.c      optional uart scc
+dev/uart/uart_dev_z8530.c      optional uart uart_z8530 | uart scc
 dev/uart/uart_if.m             optional uart
 dev/uart/uart_subr.c           optional uart
 dev/uart/uart_tty.c            optional uart
@@ -3951,7 +3948,6 @@ kgssapi/gsstest.c         optional kgssapi_debug
 # the file should be moved to conf/files.<arch> from here.
 #
 libkern/arc4random.c           standard
-crypto/chacha20/chacha.c       standard
 libkern/asprintf.c             standard
 libkern/bcd.c                  standard
 libkern/bsearch.c              standard
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to