From owner-svn-src-all@FreeBSD.ORG  Sat Dec 31 15:58:22 2011
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 9D0A81065672;
	Sat, 31 Dec 2011 15:58:22 +0000 (UTC)
	(envelope-from bzeeb-lists@lists.zabbadoz.net)
Received: from mx1.sbone.de (mx1.sbone.de [IPv6:2a01:4f8:130:3ffc::401:25])
	by mx1.freebsd.org (Postfix) with ESMTP id 2765D8FC0C;
	Sat, 31 Dec 2011 15:58:22 +0000 (UTC)
Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:31::2013:587])
	(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.sbone.de (Postfix) with ESMTPS id F368F25D37D1;
	Sat, 31 Dec 2011 15:58:20 +0000 (UTC)
Received: from content-filter.sbone.de (content-filter.sbone.de
	[IPv6:fde9:577b:c1a9:31::2013:2742])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mail.sbone.de (Postfix) with ESMTPS id E9AA7BD82F4;
	Sat, 31 Dec 2011 15:58:19 +0000 (UTC)
X-Virus-Scanned: amavisd-new at sbone.de
Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:31::2013:587])
	by content-filter.sbone.de (content-filter.sbone.de
	[fde9:577b:c1a9:31::2013:2742]) (amavisd-new, port 10024)
	with ESMTP id JLUdKXP-KKRG; Sat, 31 Dec 2011 15:58:18 +0000 (UTC)
Received: from orange-en1.sbone.de (orange-en1.sbone.de
	[IPv6:fde9:577b:c1a9:31:cabc:c8ff:fecf:e8e3])
	(using TLSv1 with cipher AES128-SHA (128/128 bits))
	(No client certificate requested)
	by mail.sbone.de (Postfix) with ESMTPSA id 7517EBD82F3;
	Sat, 31 Dec 2011 15:58:18 +0000 (UTC)
Mime-Version: 1.0 (Apple Message framework v1084)
Content-Type: text/plain; charset=us-ascii
From: "Bjoern A. Zeeb" <bzeeb-lists@lists.zabbadoz.net>
In-Reply-To: <201112311553.pBVFrYuu072035@svn.freebsd.org>
Date: Sat, 31 Dec 2011 15:58:16 +0000
Content-Transfer-Encoding: quoted-printable
Message-Id: <F5799980-5FD9-4DD5-BFD5-641FB32206EC@lists.zabbadoz.net>
References: <201112311553.pBVFrYuu072035@svn.freebsd.org>
To: Marius Strobl <marius@FreeBSD.org>
X-Mailer: Apple Mail (2.1084)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org
Subject: Re: svn commit: r229125 - head/sys/arm/xscale/ixp425
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: Sat, 31 Dec 2011 15:58:22 -0000


On 31. Dec 2011, at 15:53 , Marius Strobl wrote:

> Author: marius
> Date: Sat Dec 31 15:53:34 2011
> New Revision: 229125
> URL: http://svn.freebsd.org/changeset/base/229125
>=20
> Log:
>  Fix header pollution, possibly unbreaking the build of =
cfi_bus_ixp4xx.c
>  as part of cfi.ko.
>=20

Thanks


> Modified:
>  head/sys/arm/xscale/ixp425/ixdp425_pci.c
>  head/sys/arm/xscale/ixp425/ixp425_pci.c
>  head/sys/arm/xscale/ixp425/ixp425var.h
>=20
> Modified: head/sys/arm/xscale/ixp425/ixdp425_pci.c
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- head/sys/arm/xscale/ixp425/ixdp425_pci.c	Sat Dec 31 15:49:07 2011	=
(r229124)
> +++ head/sys/arm/xscale/ixp425/ixdp425_pci.c	Sat Dec 31 15:53:34 2011	=
(r229125)
> @@ -43,6 +43,9 @@ __FBSDID("$FreeBSD$");
> #include <sys/module.h>
> #include <sys/malloc.h>
> #include <sys/rman.h>
> +
> +#include <dev/pci/pcivar.h>
> +
> #include <machine/bus.h>
> #include <machine/intr.h>
>=20
>=20
> Modified: head/sys/arm/xscale/ixp425/ixp425_pci.c
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- head/sys/arm/xscale/ixp425/ixp425_pci.c	Sat Dec 31 15:49:07 2011	=
(r229124)
> +++ head/sys/arm/xscale/ixp425/ixp425_pci.c	Sat Dec 31 15:53:34 2011	=
(r229125)
> @@ -45,9 +45,12 @@ __FBSDID("$FreeBSD$");
> #include <sys/module.h>
> #include <sys/rman.h>
>=20
> +#include <dev/pci/pcivar.h>
> +
> #include <machine/bus.h>
> #include <machine/cpu.h>
> #include <machine/pcb.h>
> +
> #include <vm/vm.h>
> #include <vm/pmap.h>
> #include <vm/vm_extern.h>
>=20
> Modified: head/sys/arm/xscale/ixp425/ixp425var.h
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- head/sys/arm/xscale/ixp425/ixp425var.h	Sat Dec 31 15:49:07 2011	=
(r229124)
> +++ head/sys/arm/xscale/ixp425/ixp425var.h	Sat Dec 31 15:53:34 2011	=
(r229125)
> @@ -44,7 +44,6 @@
>=20
> #include <machine/bus.h>
>=20
> -#include <dev/pci/pcivar.h>
> #include <sys/rman.h>
>=20
> /* NB: cputype is setup by set_cpufuncs */

--=20
Bjoern A. Zeeb                                 You have to have visions!
   It does not matter how good you are. It matters what good you do!