From owner-svn-src-head@FreeBSD.ORG  Fri Apr 13 18:00:49 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 8DDEA106564A;
	Fri, 13 Apr 2012 18:00:49 +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 794EA8FC17;
	Fri, 13 Apr 2012 18:00:49 +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 q3DI0nQW091304;
	Fri, 13 Apr 2012 18:00:49 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3DI0nOH091301;
	Fri, 13 Apr 2012 18:00:49 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201204131800.q3DI0nOH091301@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Fri, 13 Apr 2012 18:00:49 +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: r234231 - in head/sys: conf dev/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: Fri, 13 Apr 2012 18:00:49 -0000

Author: adrian
Date: Fri Apr 13 18:00:48 2012
New Revision: 234231
URL: http://svn.freebsd.org/changeset/base/234231

Log:
  Upgrade ATH_EEPROM_FIRMWARE to a configuration option.

Modified:
  head/sys/conf/options
  head/sys/dev/ath/if_ath_pci.c

Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options	Fri Apr 13 16:53:00 2012	(r234230)
+++ head/sys/conf/options	Fri Apr 13 18:00:48 2012	(r234231)
@@ -780,6 +780,7 @@ ATH_DIAGAPI		opt_ath.h
 ATH_TX99_DIAG		opt_ath.h
 ATH_ENABLE_11N		opt_ath.h
 ATH_ENABLE_DFS		opt_ath.h
+ATH_EEPROM_FIRMWARE	opt_ath.h
 
 # options for the Atheros hal
 AH_SUPPORT_AR5416	opt_ah.h

Modified: head/sys/dev/ath/if_ath_pci.c
==============================================================================
--- head/sys/dev/ath/if_ath_pci.c	Fri Apr 13 16:53:00 2012	(r234230)
+++ head/sys/dev/ath/if_ath_pci.c	Fri Apr 13 18:00:48 2012	(r234231)
@@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$");
 /*
  * PCI/Cardbus front-end for the Atheros Wireless LAN controller driver.
  */
+#include "opt_ath.h"
 
 #include <sys/param.h>
 #include <sys/systm.h> 
@@ -60,8 +61,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 
-/* #define	ATH_EEPROM_FIRMWARE */
-
 /* For EEPROM firmware */
 #ifdef	ATH_EEPROM_FIRMWARE
 #include <sys/linker.h>