PERFORCE change 96039 for review

[Marcel Moolenaar]

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

Change 96039 by marcel at 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>