From owner-svn-src-all@freebsd.org Mon Jan 29 17:32:31 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 085E0ED383D; Mon, 29 Jan 2018 17:32:31 +0000 (UTC) (envelope-from benno@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B06B67CF4E; Mon, 29 Jan 2018 17:32:30 +0000 (UTC) (envelope-from benno@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AB61332D5; Mon, 29 Jan 2018 17:32:30 +0000 (UTC) (envelope-from benno@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0THWUbO077052; Mon, 29 Jan 2018 17:32:30 GMT (envelope-from benno@FreeBSD.org) Received: (from benno@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0THWUhR077049; Mon, 29 Jan 2018 17:32:30 GMT (envelope-from benno@FreeBSD.org) Message-Id: <201801291732.w0THWUhR077049@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: benno set sender to benno@FreeBSD.org using -f From: Benno Rice Date: Mon, 29 Jan 2018 17:32:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r328553 - head/sys/conf X-SVN-Group: head X-SVN-Commit-Author: benno X-SVN-Commit-Paths: head/sys/conf X-SVN-Commit-Revision: 328553 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Jan 2018 17:32:31 -0000 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