PERFORCE change 36736 for review

[Marcel Moolenaar]

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

Change 36736 by marcel at marcel_nfs on 2003/08/22 23:02:08

	IFC @36735

Affected files ...

.. //depot/projects/uart/dev/hme/if_hme.c#3 integrate
.. //depot/projects/uart/dev/hme/if_hme_pci.c#4 integrate
.. //depot/projects/uart/dev/hme/if_hme_sbus.c#3 integrate
.. //depot/projects/uart/dev/mk48txx/mk48txx.c#2 integrate
.. //depot/projects/uart/dev/puc/puc_ebus.c#3 edit
.. //depot/projects/uart/sparc64/sparc64/eeprom.c#3 integrate
.. //depot/projects/uart/sparc64/sparc64/eeprom_ebus.c#3 integrate
.. //depot/projects/uart/sparc64/sparc64/eeprom_fhc.c#3 integrate
.. //depot/projects/uart/sparc64/sparc64/eeprom_sbus.c#3 integrate

Differences ...

==== //depot/projects/uart/dev/hme/if_hme.c#3 (text+ko) ====

@@ -36,7 +36,7 @@
  *
  *	from: NetBSD: hme.c,v 1.20 2000/12/14 06:27:25 thorpej Exp
  *
- * $FreeBSD: src/sys/dev/hme/if_hme.c,v 1.14 2003/07/01 15:51:57 scottl Exp $
+ * $FreeBSD: src/sys/dev/hme/if_hme.c,v 1.15 2003/08/23 05:51:03 marcel Exp $
  */
 
 /*
@@ -82,8 +82,8 @@
 
 #include <machine/bus.h>
 
-#include <hme/if_hmereg.h>
-#include <hme/if_hmevar.h>
+#include <dev/hme/if_hmereg.h>
+#include <dev/hme/if_hmevar.h>
 
 static void	hme_start(struct ifnet *);
 static void	hme_stop(struct hme_softc *);

==== //depot/projects/uart/dev/hme/if_hme_pci.c#4 (text+ko) ====

@@ -27,7 +27,7 @@
  *
  *	from: NetBSD: if_hme_pci.c,v 1.4 2001/08/27 22:18:49 augustss Exp
  *
- * $FreeBSD: src/sys/dev/hme/if_hme_pci.c,v 1.8 2003/08/22 06:00:26 imp Exp $
+ * $FreeBSD: src/sys/dev/hme/if_hme_pci.c,v 1.9 2003/08/23 05:51:03 marcel Exp $
  */
 
 /*
@@ -53,14 +53,14 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#include <mii/mii.h>
-#include <mii/miivar.h>
+#include <dev/mii/mii.h>
+#include <dev/mii/miivar.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 
-#include <hme/if_hmereg.h>
-#include <hme/if_hmevar.h>
+#include <dev/hme/if_hmereg.h>
+#include <dev/hme/if_hmevar.h>
 
 #include "miibus_if.h"
 

==== //depot/projects/uart/dev/hme/if_hme_sbus.c#3 (text+ko) ====

@@ -35,7 +35,7 @@
  *
  *	from: NetBSD: if_hme_sbus.c,v 1.9 2001/11/13 06:58:17 lukem Exp
  *
- * $FreeBSD: src/sys/dev/hme/if_hme_sbus.c,v 1.5 2003/08/23 00:11:16 imp Exp $
+ * $FreeBSD: src/sys/dev/hme/if_hme_sbus.c,v 1.6 2003/08/23 05:51:03 marcel Exp $
  */
 
 /*
@@ -63,13 +63,13 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#include <mii/mii.h>
-#include <mii/miivar.h>
+#include <dev/mii/mii.h>
+#include <dev/mii/miivar.h>
 
 #include <sparc64/sbus/sbusvar.h>
 
-#include <hme/if_hmereg.h>
-#include <hme/if_hmevar.h>
+#include <dev/hme/if_hmereg.h>
+#include <dev/hme/if_hmevar.h>
 
 #include "miibus_if.h"
 

==== //depot/projects/uart/dev/mk48txx/mk48txx.c#2 (text+ko) ====

@@ -35,7 +35,7 @@
  *
  *	$NetBSD: mk48txx.c,v 1.7 2001/04/08 17:05:10 tsutsui Exp $
  *
- * $FreeBSD: src/sys/dev/mk48txx/mk48txx.c,v 1.1 2002/04/04 23:44:42 tmm Exp $
+ * $FreeBSD: src/sys/dev/mk48txx/mk48txx.c,v 1.2 2003/08/23 05:54:06 marcel Exp $
  */
 
 /*
@@ -50,7 +50,7 @@
 
 #include <machine/bus.h>
 
-#include <mk48txx/mk48txxreg.h>
+#include <dev/mk48txx/mk48txxreg.h>
 
 #include "clock_if.h"
 

==== //depot/projects/uart/dev/puc/puc_ebus.c#3 (text+ko) ====

@@ -38,7 +38,7 @@
 #include <sys/rman.h>
 #include <machine/resource.h>
 
-#include <ofw/openfirm.h>
+#include <dev/ofw/openfirm.h>
 #include <sparc64/ebus/ebusvar.h>
 
 #define	PUC_ENTRAILS	1

==== //depot/projects/uart/sparc64/sparc64/eeprom.c#3 (text+ko) ====

@@ -51,7 +51,7 @@
  *	from: @(#)clock.c	8.1 (Berkeley) 6/11/93
  *	from: NetBSD: clock.c,v 1.41 2001/07/24 19:29:25 eeh Exp
  *
- * $FreeBSD: src/sys/sparc64/sparc64/eeprom.c,v 1.2 2003/08/23 00:11:15 imp Exp $
+ * $FreeBSD: src/sys/sparc64/sparc64/eeprom.c,v 1.3 2003/08/23 05:56:58 marcel Exp $
  */
 
 #include <sys/param.h>
@@ -71,7 +71,7 @@
 
 #include <machine/eeprom.h>
 
-#include <mk48txx/mk48txxreg.h>
+#include <dev/mk48txx/mk48txxreg.h>
 
 #include "clock_if.h"
 

==== //depot/projects/uart/sparc64/sparc64/eeprom_ebus.c#3 (text+ko) ====

@@ -51,7 +51,7 @@
  *	from: @(#)clock.c	8.1 (Berkeley) 6/11/93
  *	from: NetBSD: clock.c,v 1.41 2001/07/24 19:29:25 eeh Exp
  *
- * $FreeBSD: src/sys/sparc64/sparc64/eeprom_ebus.c,v 1.2 2003/08/23 00:11:15 imp Exp $
+ * $FreeBSD: src/sys/sparc64/sparc64/eeprom_ebus.c,v 1.3 2003/08/23 05:56:58 marcel Exp $
  */
 
 #include <sys/param.h>
@@ -71,7 +71,7 @@
 
 #include <machine/eeprom.h>
 
-#include <mk48txx/mk48txxreg.h>
+#include <dev/mk48txx/mk48txxreg.h>
 
 #include <sparc64/ebus/ebusvar.h>
 

==== //depot/projects/uart/sparc64/sparc64/eeprom_fhc.c#3 (text+ko) ====

@@ -51,7 +51,7 @@
  *	from: @(#)clock.c	8.1 (Berkeley) 6/11/93
  *	from: NetBSD: clock.c,v 1.41 2001/07/24 19:29:25 eeh Exp
  *
- * $FreeBSD: src/sys/sparc64/sparc64/eeprom_fhc.c,v 1.2 2003/08/23 00:11:15 imp Exp $
+ * $FreeBSD: src/sys/sparc64/sparc64/eeprom_fhc.c,v 1.3 2003/08/23 05:56:58 marcel Exp $
  */
 
 #include <sys/param.h>
@@ -71,7 +71,7 @@
 
 #include <machine/eeprom.h>
 
-#include <mk48txx/mk48txxreg.h>
+#include <dev/mk48txx/mk48txxreg.h>
 
 #include <sparc64/fhc/fhcreg.h>
 #include <sparc64/fhc/fhcvar.h>

==== //depot/projects/uart/sparc64/sparc64/eeprom_sbus.c#3 (text+ko) ====

@@ -51,7 +51,7 @@
  *	from: @(#)clock.c	8.1 (Berkeley) 6/11/93
  *	from: NetBSD: clock.c,v 1.41 2001/07/24 19:29:25 eeh Exp
  *
- * $FreeBSD: src/sys/sparc64/sparc64/eeprom_sbus.c,v 1.2 2003/08/23 00:11:15 imp Exp $
+ * $FreeBSD: src/sys/sparc64/sparc64/eeprom_sbus.c,v 1.3 2003/08/23 05:56:58 marcel Exp $
  */
 
 #include <sys/param.h>
@@ -71,7 +71,7 @@
 
 #include <machine/eeprom.h>
 
-#include <mk48txx/mk48txxreg.h>
+#include <dev/mk48txx/mk48txxreg.h>
 
 #include <sparc64/sbus/sbusvar.h>