From owner-svn-src-all@FreeBSD.ORG  Mon Jan 16 05:07:33 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 35030106564A;
	Mon, 16 Jan 2012 05:07:33 +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 1F3828FC12;
	Mon, 16 Jan 2012 05:07:33 +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 q0G57WHA016715;
	Mon, 16 Jan 2012 05:07:32 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0G57WHL016710;
	Mon, 16 Jan 2012 05:07:32 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201201160507.q0G57WHL016710@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Mon, 16 Jan 2012 05:07:32 +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: r230195 - in head/sys: conf mips/atheros
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: Mon, 16 Jan 2012 05:07:33 -0000

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>