From owner-svn-src-head@FreeBSD.ORG  Thu Nov 10 23:17:00 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5A259106564A;
	Thu, 10 Nov 2011 23:17:00 +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 4AAB38FC0C;
	Thu, 10 Nov 2011 23:17:00 +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 pAANH08u060524;
	Thu, 10 Nov 2011 23:17:00 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAANH0PQ060522;
	Thu, 10 Nov 2011 23:17:00 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201111102317.pAANH0PQ060522@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Thu, 10 Nov 2011 23:17:00 +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: r227433 - head/sys/modules/ath
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Nov 2011 23:17:00 -0000

Author: adrian
Date: Thu Nov 10 23:16:59 2011
New Revision: 227433
URL: http://svn.freebsd.org/changeset/base/227433

Log:
  Revert this previous commit for now - although this override unfortunately
  results in the HAL being built without HAL debugging/diagnostic support,
  the module building process needs to be somehow taught to not build AR5416+
  NICs if AH_SUPPORT_AR5416 isn't defined in opt_ah.h .

Modified:
  head/sys/modules/ath/Makefile

Modified: head/sys/modules/ath/Makefile
==============================================================================
--- head/sys/modules/ath/Makefile	Thu Nov 10 23:14:04 2011	(r227432)
+++ head/sys/modules/ath/Makefile	Thu Nov 10 23:16:59 2011	(r227433)
@@ -140,9 +140,7 @@ SRCS+=	dfs_null.c
 
 CFLAGS+=  -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal
 
-.if !defined(KERNBUILDDIR)
 opt_ah.h:
 	echo '#define AH_SUPPORT_AR5416 1' > $@
-.endif
 
 .include <bsd.kmod.mk>