From owner-p4-projects@FreeBSD.ORG  Thu Sep 15 22:52:56 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9B2EC16A439; Thu, 15 Sep 2005 22:52:55 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 6A58116A420
	for <perforce@freebsd.org>; Thu, 15 Sep 2005 22:52:55 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 39CB443D46
	for <perforce@freebsd.org>; Thu, 15 Sep 2005 22:52:55 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j8FMqtxV028737
	for <perforce@freebsd.org>; Thu, 15 Sep 2005 22:52:55 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j8FMqsYE028734
	for perforce@freebsd.org; Thu, 15 Sep 2005 22:52:54 GMT
	(envelope-from sam@freebsd.org)
Date: Thu, 15 Sep 2005 22:52:54 GMT
Message-Id: <200509152252.j8FMqsYE028734@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 83718 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Thu, 15 Sep 2005 22:52:56 -0000

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

Change 83718 by sam@sam_ebb on 2005/09/15 22:52:23

	undo breakage

Affected files ...

.. //depot/projects/wifi/sys/conf/kern.pre.mk#9 edit

Differences ...

==== //depot/projects/wifi/sys/conf/kern.pre.mk#9 (text+ko) ====

@@ -55,11 +55,8 @@
 # ... and the same for altq
 INCLUDES+= -I$S/contrib/altq
 
-# ... and the same for Atheros HAL when the author builds it from
-#     non-distributable sources.
-.if defined(ATH_BUILDING_FROM_SOURCE)
-INCLUDES+= -I$S/contrib/dev/ath
-.endif
+# ... and the same for Atheros HAL
+INCLUDES+= -I$S/contrib/dev/ath -I$S/contrib/dev/ath/freebsd
 
 .if make(depend) || make(kernel-depend)
 
@@ -69,9 +66,6 @@
 # ... and the same for pf
 INCLUDES+= -I$S/contrib/pf
 
-# ... and the same for Atheros HAL
-INCLUDES+= -I$S/contrib/dev/ath/freebsd
-
 # ... and the same for the NgATM stuff
 INCLUDES+= -I$S/contrib/ngatm