From owner-p4-projects@FreeBSD.ORG Wed Dec 19 20:57:29 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82D9E16A46C; Wed, 19 Dec 2007 20:57:29 +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 0A80D16A573 for ; Wed, 19 Dec 2007 20:57:29 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 01A0313C4DD for ; Wed, 19 Dec 2007 20:57:29 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBJKvSaq033098 for ; Wed, 19 Dec 2007 20:57:28 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBJKvS3f033095 for perforce@freebsd.org; Wed, 19 Dec 2007 20:57:28 GMT (envelope-from marcel@freebsd.org) Date: Wed, 19 Dec 2007 20:57:28 GMT Message-Id: <200712192057.lBJKvS3f033095@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 131253 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Dec 2007 20:57:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=131253 Change 131253 by marcel@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 #include -#include #include #include #include ==== //depot/projects/e500/sys/powerpc/powermac/grackle.c#6 (text+ko) ==== @@ -41,7 +41,6 @@ #include #include -#include #include #include #include ==== //depot/projects/e500/sys/powerpc/powermac/uninorth.c#6 (text+ko) ==== @@ -39,7 +39,6 @@ #include #include -#include #include #include #include ==== //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 +__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/bus_machdep.c,v 1.1 2007/12/19 18:00:50 marcel Exp $"); #include #include