From owner-svn-src-all@FreeBSD.ORG  Sat Jan  7 20:23:05 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E65AE106564A;
	Sat,  7 Jan 2012 20:23:05 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D11B28FC0A;
	Sat,  7 Jan 2012 20:23:05 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q07KN5bX055154;
	Sat, 7 Jan 2012 20:23:05 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q07KN5RK055151;
	Sat, 7 Jan 2012 20:23:05 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201201072023.q07KN5RK055151@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sat, 7 Jan 2012 20:23:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229791 - head/sys/dev/ath/ath_hal
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Jan 2012 20:23:06 -0000

Author: adrian
Date: Sat Jan  7 20:23:05 2012
New Revision: 229791
URL: http://svn.freebsd.org/changeset/base/229791

Log:
  .. the AR5416 HAL code touches the MIMO parts in HAL_CHANNEL,
  so this is also needed.
  
  Pointed out by:	bz

Modified:
  head/sys/dev/ath/ath_hal/ah_desc.h
  head/sys/dev/ath/ath_hal/ah_internal.h

Modified: head/sys/dev/ath/ath_hal/ah_desc.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ah_desc.h	Sat Jan  7 20:13:55 2012	(r229790)
+++ head/sys/dev/ath/ath_hal/ah_desc.h	Sat Jan  7 20:23:05 2012	(r229791)
@@ -31,7 +31,9 @@
  * they'll be initialised to 0 anyway.
  */
 
+#ifndef	AH_SUPPORT_AR5416
 #define	AH_SUPPORT_AR5416	1
+#endif
 
 /*
  * Transmit descriptor status.  This structure is filled

Modified: head/sys/dev/ath/ath_hal/ah_internal.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ah_internal.h	Sat Jan  7 20:13:55 2012	(r229790)
+++ head/sys/dev/ath/ath_hal/ah_internal.h	Sat Jan  7 20:23:05 2012	(r229791)
@@ -30,6 +30,10 @@
 #include <net80211/_ieee80211.h>
 #include "opt_ah.h"			/* needed for AH_SUPPORT_AR5416 */
 
+#ifndef	AH_SUPPORT_AR5416
+#define	AH_SUPPORT_AR5416	1
+#endif
+
 #ifndef NBBY
 #define	NBBY	8			/* number of bits/byte */
 #endif