PERFORCE change 131253 for review

[Marcel Moolenaar]

http://perforce.freebsd.org/chv.cgi?CH=131253

Change 131253 by marcel at marcel_xcllnt on 2007/12/19 20:57:08

	Resolve merge conflicts.

Affected files ...

.. //depot/projects/e500/sys/dev/powermac_nvram/powermac_nvram.c#4 edit
.. //depot/projects/e500/sys/powerpc/powermac/grackle.c#6 edit
.. //depot/projects/e500/sys/powerpc/powermac/uninorth.c#6 edit
.. //depot/projects/e500/sys/powerpc/powerpc/bus_machdep.c#3 edit

Differences ...

==== //depot/projects/e500/sys/dev/powermac_nvram/powermac_nvram.c#4 (text+ko) ====

@@ -38,7 +38,6 @@
 #include <dev/ofw/ofw_pci.h>
 
 #include <machine/bus.h>
-#include <machine/pio.h>
 #include <machine/md_var.h>
 #include <machine/nexusvar.h>
 #include <machine/pio.h>

==== //depot/projects/e500/sys/powerpc/powermac/grackle.c#6 (text+ko) ====

@@ -41,7 +41,6 @@
 #include <dev/pci/pcireg.h>
 
 #include <machine/bus.h>
-#include <machine/pio.h>
 #include <machine/md_var.h>
 #include <machine/nexusvar.h>
 #include <machine/pio.h>

==== //depot/projects/e500/sys/powerpc/powermac/uninorth.c#6 (text+ko) ====

@@ -39,7 +39,6 @@
 #include <dev/pci/pcireg.h>
 
 #include <machine/bus.h>
-#include <machine/pio.h>
 #include <machine/md_var.h>
 #include <machine/nexusvar.h>
 #include <machine/pio.h>

==== //depot/projects/e500/sys/powerpc/powerpc/bus_machdep.c#3 (text+ko) ====

@@ -36,43 +36,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*-
- * Copyright (c) 1996 Charles M. Hannum.  All rights reserved.
- * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Christopher G. Demetriou
- *	for the NetBSD Project.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$NetBSD: bus.h,v 1.9.4.1 2000/06/30 16:27:30 simonb Exp $
- * $FreeBSD: src/sys/powerpc/include/bus.h,v 1.17 2005/04/18 21:45:34 imp Exp $
- */
-
-/*
- * bus_space methods for MPC85xx on-chip peripherals bus space ops.
- */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/bus_machdep.c,v 1.1 2007/12/19 18:00:50 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>