From owner-svn-src-stable-7@FreeBSD.ORG  Mon May 10 20:00:50 2010
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id CF7D41065674;
	Mon, 10 May 2010 20:00:50 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id BD7ED8FC0C;
	Mon, 10 May 2010 20:00:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o4AK0oGF053453;
	Mon, 10 May 2010 20:00:50 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4AK0oVq053448;
	Mon, 10 May 2010 20:00:50 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201005102000.o4AK0oVq053448@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Mon, 10 May 2010 20:00:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207883 - in stable/7/sys: dev/ofw powerpc/include
	sparc64/include sun4v/include
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 May 2010 20:00:50 -0000

Author: marius
Date: Mon May 10 20:00:50 2010
New Revision: 207883
URL: http://svn.freebsd.org/changeset/base/207883

Log:
  Partial MFC 186347 and 186355 in order to remove differences in headers
  required.

Modified:
  stable/7/sys/dev/ofw/openfirm.h
  stable/7/sys/powerpc/include/ofw_machdep.h
  stable/7/sys/sparc64/include/ofw_machdep.h
  stable/7/sys/sun4v/include/ofw_machdep.h

Modified: stable/7/sys/dev/ofw/openfirm.h
==============================================================================
--- stable/7/sys/dev/ofw/openfirm.h	Mon May 10 19:54:01 2010	(r207882)
+++ stable/7/sys/dev/ofw/openfirm.h	Mon May 10 20:00:50 2010	(r207883)
@@ -74,6 +74,8 @@ typedef unsigned int	phandle_t;
 #include <sys/types.h>
 #include <sys/malloc.h>
 
+#include <machine/ofw_machdep.h>
+
 MALLOC_DECLARE(M_OFWPROP);
 
 /*

Modified: stable/7/sys/powerpc/include/ofw_machdep.h
==============================================================================
--- stable/7/sys/powerpc/include/ofw_machdep.h	Mon May 10 19:54:01 2010	(r207882)
+++ stable/7/sys/powerpc/include/ofw_machdep.h	Mon May 10 20:00:50 2010	(r207883)
@@ -28,7 +28,11 @@
 #ifndef _MACHINE_OFW_MACHDEP_H_
 #define _MACHINE_OFW_MACHDEP_H_
 
+#include <sys/cdefs.h>
+#include <sys/types.h>
+#include <sys/rman.h>
 #include <sys/bus.h>
+#include <dev/ofw/openfirm.h>
 
 int  OF_decode_addr(phandle_t, int, bus_space_tag_t *, bus_space_handle_t *);
 void OF_getetheraddr(device_t dev, u_char *addr);

Modified: stable/7/sys/sparc64/include/ofw_machdep.h
==============================================================================
--- stable/7/sys/sparc64/include/ofw_machdep.h	Mon May 10 19:54:01 2010	(r207882)
+++ stable/7/sys/sparc64/include/ofw_machdep.h	Mon May 10 20:00:50 2010	(r207883)
@@ -29,6 +29,8 @@
 #define _MACHINE_OFW_MACHDEP_H_
 
 #include <sys/bus.h>
+#include <machine/bus.h>
+#include <dev/ofw/openfirm.h>
 
 int  OF_decode_addr(phandle_t, int, int *, bus_addr_t *);
 void OF_getetheraddr(device_t, u_char *);

Modified: stable/7/sys/sun4v/include/ofw_machdep.h
==============================================================================
--- stable/7/sys/sun4v/include/ofw_machdep.h	Mon May 10 19:54:01 2010	(r207882)
+++ stable/7/sys/sun4v/include/ofw_machdep.h	Mon May 10 20:00:50 2010	(r207883)
@@ -29,6 +29,8 @@
 #define _MACHINE_OFW_MACHDEP_H_
 
 #include <sys/bus.h>
+#include <machine/bus.h>
+#include <dev/ofw/openfirm.h>
 
 int  OF_decode_addr(phandle_t, int, int *, bus_addr_t *);
 void OF_getetheraddr(device_t, u_char *);