Date: Mon, 10 May 2010 20:00:50 +0000 (UTC) From: Marius Strobl <marius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r207883 - in stable/7/sys: dev/ofw powerpc/include sparc64/include sun4v/include Message-ID: <201005102000.o4AK0oVq053448@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 *);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005102000.o4AK0oVq053448>