From owner-p4-projects@FreeBSD.ORG  Fri Jan 15 20:04:23 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CE48A106568B; Fri, 15 Jan 2010 20:04:23 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 92D551065676
	for <perforce@freebsd.org>; Fri, 15 Jan 2010 20:04:23 +0000 (UTC)
	(envelope-from raj@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 80AB18FC08
	for <perforce@freebsd.org>; Fri, 15 Jan 2010 20:04:23 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0FK4N0n010771
	for <perforce@freebsd.org>; Fri, 15 Jan 2010 20:04:23 GMT
	(envelope-from raj@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0FK4NYl010769
	for perforce@freebsd.org; Fri, 15 Jan 2010 20:04:23 GMT
	(envelope-from raj@freebsd.org)
Date: Fri, 15 Jan 2010 20:04:23 GMT
Message-Id: <201001152004.o0FK4NYl010769@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	raj@freebsd.org using -f
From: Rafal Jaworowski <raj@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 173195 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Jan 2010 20:04:24 -0000

http://p4web.freebsd.org/chv.cgi?CH=173195

Change 173195 by raj@raj_fdt on 2010/01/15 20:04:03

	Revert the last #includes reorg and simply introduce ARM specific
	ofw_machdep.h as there is for PowerPC.
	
	Previous changes broke AIM PowerPC build.

Affected files ...

.. //depot/projects/fdt/sys/arm/include/ofw_machdep.h#1 add
.. //depot/projects/fdt/sys/dev/fdt/fdt_common.c#6 edit
.. //depot/projects/fdt/sys/dev/ofw/openfirm.h#4 edit
.. //depot/projects/fdt/sys/dev/uart/uart_bus_fdt.c#4 edit

Differences ...

==== //depot/projects/fdt/sys/dev/fdt/fdt_common.c#6 (text+ko) ====

@@ -38,7 +38,6 @@
 #include <sys/bus.h>
 
 #include <machine/intr_machdep.h>
-#include <machine/resource.h>
 
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>

==== //depot/projects/fdt/sys/dev/ofw/openfirm.h#4 (text+ko) ====

@@ -73,6 +73,8 @@
 #ifdef _KERNEL
 #include <sys/malloc.h>
 
+#include <machine/ofw_machdep.h>
+
 MALLOC_DECLARE(M_OFWPROP);
 
 /*

==== //depot/projects/fdt/sys/dev/uart/uart_bus_fdt.c#4 (text+ko) ====

@@ -35,8 +35,6 @@
 #include <sys/kernel.h>
 #include <sys/module.h>
 
-#include <machine/bus.h>
-
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 #include <dev/uart/uart.h>