From owner-svn-src-head@FreeBSD.ORG Wed Nov 9 23:37:14 2011 Return-Path: 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 4730B1065672; Wed, 9 Nov 2011 23:37:14 +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 36F3E8FC0A; Wed, 9 Nov 2011 23:37:14 +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 pA9NbEV2004930; Wed, 9 Nov 2011 23:37:14 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA9NbEYZ004928; Wed, 9 Nov 2011 23:37:14 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201111092337.pA9NbEYZ004928@svn.freebsd.org> From: Adrian Chadd Date: Wed, 9 Nov 2011 23:37:14 +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: r227412 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Nov 2011 23:37:14 -0000 Author: adrian Date: Wed Nov 9 23:37:13 2011 New Revision: 227412 URL: http://svn.freebsd.org/changeset/base/227412 Log: Use the system-provided opt_ah.h if one is provided. This implies that users who are building the driver do so with KERNBUILDDIR set to the compile/CONFIG directory so the various opt_* sources can be pulled in. Modified: head/sys/modules/ath/Makefile Modified: head/sys/modules/ath/Makefile ============================================================================== --- head/sys/modules/ath/Makefile Wed Nov 9 23:28:47 2011 (r227411) +++ head/sys/modules/ath/Makefile Wed Nov 9 23:37:13 2011 (r227412) @@ -140,7 +140,9 @@ 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