From owner-p4-projects@FreeBSD.ORG  Mon Apr 24 23:55:14 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1A37916A405; Mon, 24 Apr 2006 23:55:14 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id DB6E416A403
	for <perforce@freebsd.org>; Mon, 24 Apr 2006 23:55:13 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 88A4B43D48
	for <perforce@freebsd.org>; Mon, 24 Apr 2006 23:55:13 +0000 (GMT)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3ONtDYV020226
	for <perforce@freebsd.org>; Mon, 24 Apr 2006 23:55:13 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3ONtD2E020223
	for perforce@freebsd.org; Mon, 24 Apr 2006 23:55:13 GMT
	(envelope-from marcel@freebsd.org)
Date: Mon, 24 Apr 2006 23:55:13 GMT
Message-Id: <200604242355.k3ONtD2E020223@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 96039 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Mon, 24 Apr 2006 23:55:14 -0000

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

Change 96039 by marcel@marcel_nfs on 2006/04/24 23:54:28

	Diff reduction.

Affected files ...

.. //depot/projects/uart/dev/ppc/ppc_acpi.c#3 edit
.. //depot/projects/uart/dev/ppc/ppc_isa.c#3 edit
.. //depot/projects/uart/dev/ppc/ppc_pci.c#3 edit

Differences ...

==== //depot/projects/uart/dev/ppc/ppc_acpi.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppc/ppc_acpi.c,v 1.1 2006/04/24 23:31:51 marcel Exp $");
 
 #include "opt_isa.h"
 

==== //depot/projects/uart/dev/ppc/ppc_isa.c#3 (text+ko) ====

@@ -1,4 +1,6 @@
 /*-
+ * Copyright (c) 1997-2000 Nicolas Souchu
+ * Copyright (c) 2001 Alcove - Nicolas Souchu
  * Copyright (c) 2006 Marcel Moolenaar
  * All rights reserved.
  *
@@ -24,10 +26,8 @@
  * SUCH DAMAGE.
  */
 
-#if !(defined(__i386__) && defined(PC98))
-
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppc/ppc_isa.c,v 1.1 2006/04/24 23:31:51 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -37,7 +37,11 @@
 #include <machine/bus.h>
 #include <sys/malloc.h>
 
+#if defined(__i386__) && defined(PC98)
+#include <pc98/cbus/cbus.h>
+#else
 #include <isa/isareg.h>
+#endif
 #include <isa/isavar.h>
 
 #include <dev/ppbus/ppbconf.h>
@@ -275,5 +279,3 @@
 }
 
 DRIVER_MODULE(ppc, isa, ppc_isa_driver, ppc_devclass, 0, 0);
-
-#endif /* !(defined(__i386__) && defined(PC98)) */

==== //depot/projects/uart/dev/ppc/ppc_pci.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/ppc/ppc_pci.c,v 1.1 2006/04/24 23:31:51 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>