svn commit: r328553 - head/sys/conf

[Benno Rice]

Author: benno
Date: Mon Jan 29 17:32:30 2018
New Revision: 328553
URL: https://svnweb.freebsd.org/changeset/base/328553

Log:
  Remove some duplicated sys/conf/files* entries.
  
  net80211/ieee80211_ageq.c was present twice in sys/conf/files so leave the
  correctly sorted one. dev/wpi/if_wpi.c was present in sys/conf/files as well
  as sys/conf/files.amd64 and sys/conf/files.i386 so prefer the sys/conf/files
  entry.
  
  Reviewed by:	allanjude, rstone

Modified:
  head/sys/conf/files
  head/sys/conf/files.amd64
  head/sys/conf/files.i386

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Mon Jan 29 16:12:26 2018	(r328552)
+++ head/sys/conf/files	Mon Jan 29 17:32:30 2018	(r328553)
@@ -4114,7 +4114,6 @@ net/vnet.c			optional vimage
 net80211/ieee80211.c		optional wlan
 net80211/ieee80211_acl.c	optional wlan wlan_acl
 net80211/ieee80211_action.c	optional wlan
-net80211/ieee80211_ageq.c	optional wlan
 net80211/ieee80211_adhoc.c	optional wlan \
 	compile-with "${NORMAL_C} -Wno-unused-function"
 net80211/ieee80211_ageq.c	optional wlan

Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64	Mon Jan 29 16:12:26 2018	(r328552)
+++ head/sys/conf/files.amd64	Mon Jan 29 17:32:30 2018	(r328553)
@@ -473,7 +473,6 @@ dev/uart/uart_cpu_x86.c		optional	uart
 dev/viawd/viawd.c		optional	viawd
 dev/vmware/vmxnet3/if_vmx.c	optional	vmx
 dev/wbwd/wbwd.c			optional	wbwd
-dev/wpi/if_wpi.c		optional	wpi
 dev/xen/pci/xen_acpi_pci.c	optional	xenhvm
 dev/xen/pci/xen_pci.c		optional	xenhvm
 dev/isci/isci.c							optional isci

Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386	Mon Jan 29 16:12:26 2018	(r328552)
+++ head/sys/conf/files.i386	Mon Jan 29 17:32:30 2018	(r328553)
@@ -328,7 +328,6 @@ dev/acpica/acpi_hpet.c		optional acpi
 dev/acpica/acpi_timer.c		optional acpi
 dev/acpi_support/acpi_wmi_if.m	standard
 dev/wbwd/wbwd.c			optional wbwd
-dev/wpi/if_wpi.c		optional wpi
 dev/isci/isci.c							optional isci
 dev/isci/isci_controller.c					optional isci
 dev/isci/isci_domain.c						optional isci