From owner-p4-projects@FreeBSD.ORG  Sun May 16 15:32:09 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C975E16A4D0; Sun, 16 May 2004 15:32:08 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A073E16A4CE
	for <perforce@freebsd.org>; Sun, 16 May 2004 15:32:08 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 61FB743D48
	for <perforce@freebsd.org>; Sun, 16 May 2004 15:32:08 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i4GMW8Ge034551
	for <perforce@freebsd.org>; Sun, 16 May 2004 15:32:08 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i4GMW73E034545
	for perforce@freebsd.org; Sun, 16 May 2004 15:32:07 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Date: Sun, 16 May 2004 15:32:07 -0700 (PDT)
Message-Id: <200405162232.i4GMW73E034545@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52891 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 May 2004 22:32:09 -0000

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

Change 52891 by peter@peter_overcee on 2004/05/16 15:31:58

	IFC @52890

Affected files ...

.. //depot/projects/hammer/sys/modules/Makefile#44 integrate

Differences ...

==== //depot/projects/hammer/sys/modules/Makefile#44 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/Makefile,v 1.380 2004/05/16 13:58:27 ru Exp $
+# $FreeBSD: src/sys/modules/Makefile,v 1.381 2004/05/16 22:24:57 peter Exp $
 
 # pcic -- currently broken and being worked on out of tree.
 # oldcard -- specialized use for debugging only.
@@ -375,7 +375,7 @@
 .endif
 
 .if ${MACHINE_ARCH} == "amd64"
-_ndis=		ndis
+#_ndis=		ndis
 .endif
 
 .if ${MACHINE_ARCH} == "ia64"