From owner-svn-src-all@FreeBSD.ORG  Thu Jan  5 06:22:09 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 E6464106564A;
	Thu,  5 Jan 2012 06:22:09 +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 D0DBF8FC08;
	Thu,  5 Jan 2012 06:22:09 +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 q056M9sf018049;
	Thu, 5 Jan 2012 06:22:09 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q056M9EW018047;
	Thu, 5 Jan 2012 06:22:09 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201201050622.q056M9EW018047@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Thu, 5 Jan 2012 06:22:09 +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: r229560 - head/sys/modules/ath
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: Thu, 05 Jan 2012 06:22:10 -0000

Author: adrian
Date: Thu Jan  5 06:22:09 2012
New Revision: 229560
URL: http://svn.freebsd.org/changeset/base/229560

Log:
  Re-enable this bit of logic from before, which only sets a default
  opt_ah.h file if KERNBUILDDIR isn't defined.
  
  For now, AH_SUPPORT_AR5416 is required, so I'll just fix any
  configuration file in /usr/src which is missing this option.
  
  Pointy hat when things do break to:	adrian

Modified:
  head/sys/modules/ath/Makefile

Modified: head/sys/modules/ath/Makefile
==============================================================================
--- head/sys/modules/ath/Makefile	Thu Jan  5 04:50:28 2012	(r229559)
+++ head/sys/modules/ath/Makefile	Thu Jan  5 06:22:09 2012	(r229560)
@@ -140,8 +140,10 @@ 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>