From owner-p4-projects@FreeBSD.ORG  Fri Nov 28 23:29:23 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BE1E61065676; Fri, 28 Nov 2008 23:29:23 +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 8216F1065675
	for <perforce@freebsd.org>; Fri, 28 Nov 2008 23:29:23 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6BB088FC0C
	for <perforce@freebsd.org>; Fri, 28 Nov 2008 23:29:23 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mASNTNB1011691
	for <perforce@freebsd.org>; Fri, 28 Nov 2008 23:29:23 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mASNTNLr011689
	for perforce@freebsd.org; Fri, 28 Nov 2008 23:29:23 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 28 Nov 2008 23:29:23 GMT
Message-Id: <200811282329.mASNTNLr011689@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 153724 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: Fri, 28 Nov 2008 23:29:24 -0000

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

Change 153724 by sam@sam_ebb on 2008/11/28 23:29:19

	contrib/dev/ath -> dev/ath/ath_hal

Affected files ...

.. //depot/projects/vap/sys/dev/ath/ah_osdep.c#8 edit
.. //depot/projects/vap/sys/dev/ath/if_ath.c#126 edit
.. //depot/projects/vap/sys/dev/ath/if_ath_pci.c#8 edit
.. //depot/projects/vap/sys/dev/ath/if_athvar.h#39 edit

Differences ...

==== //depot/projects/vap/sys/dev/ath/ah_osdep.c#8 (text+ko) ====

@@ -43,7 +43,7 @@
 
 #include <net/ethernet.h>		/* XXX for ether_sprintf */
 
-#include <contrib/dev/ath/ah.h>
+#include <dev/ath/ath_hal/ah.h>
 
 /*
  * WiSoC boards overload the bus tag with information about the
@@ -192,7 +192,7 @@
  */
 #include <sys/alq.h>
 #include <sys/pcpu.h>
-#include <contrib/dev/ath/ah_decode.h>
+#include <dev/ath/ath_hal/ah_decode.h>
 
 static	struct alq *ath_hal_alq;
 static	int ath_hal_alq_emitdev;	/* need to emit DEVICE record */

==== //depot/projects/vap/sys/dev/ath/if_ath.c#126 (text+ko) ====

@@ -77,8 +77,7 @@
 #endif
 
 #include <dev/ath/if_athvar.h>
-#include <contrib/dev/ath/ah_desc.h>
-#include <contrib/dev/ath/ah_devid.h>		/* XXX for softled */
+#include <dev/ath/ath_hal/ah_devid.h>		/* XXX for softled */
 
 #ifdef ATH_TX99_DIAG
 #include <dev/ath/ath_tx99/ath_tx99.h>

==== //depot/projects/vap/sys/dev/ath/if_ath_pci.c#8 (text+ko) ====

@@ -56,7 +56,6 @@
 #include <net80211/ieee80211_var.h>
 
 #include <dev/ath/if_athvar.h>
-#include <contrib/dev/ath/ah.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>

==== //depot/projects/vap/sys/dev/ath/if_athvar.h#39 (text+ko) ====

@@ -35,8 +35,8 @@
 #ifndef _DEV_ATH_ATHVAR_H
 #define _DEV_ATH_ATHVAR_H
 
-#include <contrib/dev/ath/ah.h>
-#include <contrib/dev/ath/ah_desc.h>
+#include <dev/ath/ath_hal/ah.h>
+#include <dev/ath/ath_hal/ah_desc.h>
 #include <net80211/ieee80211_radiotap.h>
 #include <dev/ath/if_athioctl.h>
 #include <dev/ath/if_athrate.h>