From owner-svn-src-all@FreeBSD.ORG  Sat Dec 31 15:53:34 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 AD10D1065672;
	Sat, 31 Dec 2011 15:53:34 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9816A8FC16;
	Sat, 31 Dec 2011 15:53:34 +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 pBVFrYCE072039;
	Sat, 31 Dec 2011 15:53:34 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBVFrYuu072035;
	Sat, 31 Dec 2011 15:53:34 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201112311553.pBVFrYuu072035@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sat, 31 Dec 2011 15:53:34 +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: 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:53:34 -0000

Author: marius
Date: Sat Dec 31 15:53:34 2011
New Revision: 229125
URL: http://svn.freebsd.org/changeset/base/229125

Log:
  Fix header pollution, possibly unbreaking the build of cfi_bus_ixp4xx.c
  as part of cfi.ko.

Modified:
  head/sys/arm/xscale/ixp425/ixdp425_pci.c
  head/sys/arm/xscale/ixp425/ixp425_pci.c
  head/sys/arm/xscale/ixp425/ixp425var.h

Modified: head/sys/arm/xscale/ixp425/ixdp425_pci.c
==============================================================================
--- 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>
 

Modified: head/sys/arm/xscale/ixp425/ixp425_pci.c
==============================================================================
--- 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>
 
+#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>

Modified: head/sys/arm/xscale/ixp425/ixp425var.h
==============================================================================
--- 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 @@
 
 #include <machine/bus.h>
 
-#include <dev/pci/pcivar.h>
 #include <sys/rman.h>
 
 /* NB: cputype is setup by set_cpufuncs */