From owner-svn-src-head@FreeBSD.ORG Sat Jan 17 02:17:58 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D30D4978; Sat, 17 Jan 2015 02:17:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BFD27212; Sat, 17 Jan 2015 02:17:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0H2Hw3L038806; Sat, 17 Jan 2015 02:17:58 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0H2Hw0d038805; Sat, 17 Jan 2015 02:17:58 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201501170217.t0H2Hw0d038805@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sat, 17 Jan 2015 02:17:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r277284 - head/sys/conf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Jan 2015 02:17:58 -0000 Author: imp Date: Sat Jan 17 02:17:57 2015 New Revision: 277284 URL: https://svnweb.freebsd.org/changeset/base/277284 Log: Move DEV_ entries scattered to their common section. Add DEV_PCI. Modified: head/sys/conf/options Modified: head/sys/conf/options ============================================================================== --- head/sys/conf/options Sat Jan 17 02:17:55 2015 (r277283) +++ head/sys/conf/options Sat Jan 17 02:17:57 2015 (r277284) @@ -396,11 +396,6 @@ BOOTP_NFSROOT opt_bootp.h BOOTP_NFSV3 opt_bootp.h BOOTP_WIRED_TO opt_bootp.h DEVICE_POLLING -DEV_ENC opt_enc.h -DEV_PF opt_pf.h -DEV_PFLOG opt_pf.h -DEV_PFSYNC opt_pf.h -DEV_VLAN opt_vlan.h DUMMYNET opt_ipdn.h INET opt_inet.h INET6 opt_inet6.h @@ -698,10 +693,16 @@ ISAPNP opt_isa.h # various 'device presence' options. DEV_BPF opt_bpf.h -DEV_NETMAP opt_global.h -DEV_MCA opt_mca.h DEV_CARP opt_carp.h +DEV_ENC opt_enc.h +DEV_MCA opt_mca.h +DEV_NETMAP opt_global.h +DEV_PCI opt_pci.h +DEV_PF opt_pf.h +DEV_PFLOG opt_pf.h +DEV_PFSYNC opt_pf.h DEV_SPLASH opt_splash.h +DEV_VLAN opt_vlan.h # EISA support DEV_EISA opt_eisa.h