svn commit: r234231 - in head/sys: conf dev/ath

[Adrian Chadd]

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>