svn commit: r230195 - in head/sys: conf mips/atheros

[Adrian Chadd]

Author: adrian
Date: Mon Jan 16 05:07:32 2012
New Revision: 230195
URL: http://svn.freebsd.org/changeset/base/230195

Log:
  Stop overloading opt_global.h.

Modified:
  head/sys/conf/options
  head/sys/mips/atheros/ar71xx_machdep.c
  head/sys/mips/atheros/ar71xx_pci.c

Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options	Mon Jan 16 04:39:10 2012	(r230194)
+++ head/sys/conf/options	Mon Jan 16 05:07:32 2012	(r230195)
@@ -899,7 +899,7 @@ RCTL		opt_global.h
 # At least one of the AR71XX ubiquiti boards has a Redboot configuration
 # that "lies" about the amount of RAM it has. Until a cleaner method is
 # defined, this option will suffice in overriding what Redboot says.
-AR71XX_REALMEM    opt_global.h
-AR71XX_ENV_UBOOT	opt_global.h
-AR71XX_ENV_REDBOOT	opt_global.h
-AR71XX_ATH_EEPROM	opt_global.h
+AR71XX_REALMEM		opt_ar71xx.h
+AR71XX_ENV_UBOOT	opt_ar71xx.h
+AR71XX_ENV_REDBOOT	opt_ar71xx.h
+AR71XX_ATH_EEPROM	opt_ar71xx.h

Modified: head/sys/mips/atheros/ar71xx_machdep.c
==============================================================================
--- head/sys/mips/atheros/ar71xx_machdep.c	Mon Jan 16 04:39:10 2012	(r230194)
+++ head/sys/mips/atheros/ar71xx_machdep.c	Mon Jan 16 05:07:32 2012	(r230195)
@@ -28,6 +28,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
+#include "opt_ar71xx.h"
 
 #include <sys/param.h>
 #include <sys/conf.h>

Modified: head/sys/mips/atheros/ar71xx_pci.c
==============================================================================
--- head/sys/mips/atheros/ar71xx_pci.c	Mon Jan 16 04:39:10 2012	(r230194)
+++ head/sys/mips/atheros/ar71xx_pci.c	Mon Jan 16 05:07:32 2012	(r230195)
@@ -28,6 +28,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_ar71xx.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>