PERFORCE change 99480 for review

[Warner Losh]

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

Change 99480 by imp at imp_lighthouse on 2006/06/17 23:30:55

	Sync to -current.  Basically exapnd $FreeBSD$

Affected files ...

.. //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#16 edit
.. //depot/projects/arm/src/sys/arm/at91/at91_pmcreg.h#5 edit
.. //depot/projects/arm/src/sys/arm/at91/at91_pmcvar.h#3 edit
.. //depot/projects/arm/src/sys/arm/at91/at91_rtc.c#4 edit
.. //depot/projects/arm/src/sys/arm/at91/at91_rtcreg.h#4 edit
.. //depot/projects/arm/src/sys/arm/at91/at91_ssc.c#4 edit
.. //depot/projects/arm/src/sys/arm/at91/at91_sscreg.h#3 edit
.. //depot/projects/arm/src/sys/arm/at91/at91var.h#4 edit
.. //depot/projects/arm/src/sys/arm/at91/files.kb920x#4 edit
.. //depot/projects/arm/src/sys/arm/at91/ohci_atmelarm.c#12 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#16 (text+ko) ====

@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pmc.c,v 1.2 2006/06/17 23:22:10 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/arm/src/sys/arm/at91/at91_pmcreg.h#5 (text+ko) ====

@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/at91/at91_pmcreg.h,v 1.1 2006/03/24 07:37:56 imp Exp $ */
 
 #ifndef ARM_AT91_AT91_PMCREG_H
 #define ARM_AT91_AT91_PMCREG_H

==== //depot/projects/arm/src/sys/arm/at91/at91_pmcvar.h#3 (text+ko) ====

@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/at91/at91_pmcvar.h,v 1.1 2006/03/24 07:37:56 imp Exp $ */
 
 #ifndef ARM_AT91_AT91_PMCVAR_H
 #define ARM_AT91_AT91_PMCVAR_H

==== //depot/projects/arm/src/sys/arm/at91/at91_rtc.c#4 (text+ko) ====

@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91_rtc.c,v 1.1 2006/03/24 07:35:30 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/arm/src/sys/arm/at91/at91_rtcreg.h#4 (text+ko) ====

@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/at91/at91_rtcreg.h,v 1.1 2006/03/24 07:35:30 imp Exp $ */
 
 #ifndef ARM_AT91_AT91_RTCREG_H
 #define ARM_AT91_AT91_RTCREG_H

==== //depot/projects/arm/src/sys/arm/at91/at91_ssc.c#4 (text+ko) ====

@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91_ssc.c,v 1.1 2006/03/24 07:42:33 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/arm/src/sys/arm/at91/at91_sscreg.h#3 (text+ko) ====

@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/at91/at91_sscreg.h,v 1.1 2006/03/24 07:42:33 imp Exp $ */
 
 #ifndef ARM_AT91_AT91_SSCREG_H
 #define ARM_AT91_AT91_SSCREG_H

==== //depot/projects/arm/src/sys/arm/at91/at91var.h#4 (text+ko) ====

@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/at91/at91var.h,v 1.1 2006/02/04 23:32:13 imp Exp $ */
 
 #ifndef _AT91VAR_H_
 #define _AT91VAR_H_
@@ -36,7 +36,6 @@
 	bus_space_handle_t sc_sys_sh;
 	struct rman sc_irq_rman;
 	struct rman sc_mem_rman;
-	struct rman sc_usbmem_rman;
 };
 
 struct at91_ivar {

==== //depot/projects/arm/src/sys/arm/at91/files.kb920x#4 (text+ko) ====

@@ -1,2 +1,2 @@
-#$FreeBSD$
+#$FreeBSD: src/sys/arm/at91/files.kb920x,v 1.1 2006/02/04 23:32:13 imp Exp $
 arm/at91/kb920x_machdep.c	standard

==== //depot/projects/arm/src/sys/arm/at91/ohci_atmelarm.c#12 (text+ko) ====

@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/at91/ohci_atmelarm.c,v 1.1 2006/03/18 01:45:29 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>