PERFORCE change 142776 for review

John Birrell jb at FreeBSD.org
Mon Jun 2 23:14:13 UTC 2008


http://perforce.freebsd.org/chv.cgi?CH=142776

Change 142776 by jb at 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


More information about the p4-projects mailing list