From owner-p4-projects@FreeBSD.ORG Mon Jun 2 23:14:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C74871065722; Mon, 2 Jun 2008 23:14:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 352511065673 for ; Mon, 2 Jun 2008 23:14:10 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 35E438FC20 for ; Mon, 2 Jun 2008 23:14:10 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m52NEANV026612 for ; Mon, 2 Jun 2008 23:14:10 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m52NEANV026610 for perforce@freebsd.org; Mon, 2 Jun 2008 23:14:10 GMT (envelope-from jb@freebsd.org) Date: Mon, 2 Jun 2008 23:14:10 GMT Message-Id: <200806022314.m52NEANV026610@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 142776 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Jun 2008 23:14:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=142776 Change 142776 by jb@freebsd3 on 2008/06/02 23:13:46 Merging this file from current wasn't a good idea. Affected files ... .. //depot/projects/dtrace7/src/sys/modules/Makefile#14 edit Differences ... ==== //depot/projects/dtrace7/src/sys/modules/Makefile#14 (text+ko) ==== @@ -8,7 +8,6 @@ accf_data \ accf_http \ ${_acpi} \ - age \ ${_agp} \ aha \ ${_ahb} \ @@ -24,7 +23,6 @@ ${_arcmsr} \ ${_arcnet} \ ${_arl} \ - ${_asmc} \ ${_asr} \ ata \ ${_ath} \ @@ -53,7 +51,6 @@ ${_ciss} \ ${_cm} \ ${_cmx} \ - ${_cnw} \ coda \ coda5 \ ${_coff} \ @@ -68,7 +65,6 @@ ${_cx} \ cxgb \ ${_cyclic} \ - ${_cyclic_test} \ dc \ dcons \ dcons_crom \ @@ -139,12 +135,8 @@ ispfw \ ${_iwi} \ ${_iwifw} \ - ${_iwn} \ - ${_iwnfw} \ ${_ixgb} \ - jme \ joy \ - ${_k8temp} \ kbdmux \ krpc \ kue \ @@ -230,7 +222,6 @@ ${_ray} \ rc \ rc4 \ - ${_rdma} \ re \ reiserfs \ rl \ @@ -318,7 +309,6 @@ wlan_acl \ wlan_amrr \ wlan_ccmp \ - wlan_rssadapt \ wlan_tkip \ wlan_wep \ wlan_xauth \ @@ -387,7 +377,6 @@ _cs= cs .if ${MK_CDDL} != "no" || defined(ALL_MODULES) _cyclic= cyclic -_cyclic_test= cyclic_test .endif _digi= digi _drm= drm @@ -429,7 +418,6 @@ _pecoff= pecoff _pst= pst _ray= ray -_rdma= rdma _safe= safe _sbni= sbni _scsi_low= scsi_low @@ -454,13 +442,11 @@ _ahb= ahb _arcmsr= arcmsr _arl= arl -_asmc= asmc _asr= asr _bios= bios _ciss= ciss _cm= cm _cmx= cmx -_cnw= cnw _coretemp= coretemp _ctau= ctau _cx= cx @@ -478,8 +464,6 @@ _ipwfw= ipwfw _iwi= iwi _iwifw= iwifw -_iwn= iwn -_iwnfw= iwnfw _ixgb= ixgb _mly= mly _nfe= nfe @@ -510,7 +494,6 @@ _agp= agp _an= an _arcmsr= arcmsr -_asmc= asmc _ath= ath _ath_hal= ath_hal _ath_rate_amrr= ath_rate_amrr @@ -524,7 +507,6 @@ _cpufreq= cpufreq .if ${MK_CDDL} != "no" || defined(ALL_MODULES) _cyclic= cyclic -_cyclic_test= cyclic_test .endif _digi= digi _drm= drm @@ -549,10 +531,7 @@ _ips= ips _ipw= ipw _ipwfw= ipwfw -_iwn= iwn -_iwnfw= iwnfw _ixgb= ixgb -_k8temp= k8temp _linprocfs= linprocfs _linsysfs= linsysfs _linux= linux @@ -566,7 +545,6 @@ _opensolaris= opensolaris .endif _pccard= pccard -_rdma= rdma _safe= safe _scsi_low= scsi_low _smbfs= smbfs