PERFORCE change 101609 for review

[Warner Losh]

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

Change 101609 by imp at imp_harmony on 2006/07/14 22:11:37

	IFC @101606 + fixups (this is loopback from FreeBSD)

Affected files ...

.. //depot/projects/arm/src/sys/arm/at91/at91_pdcreg.h#5 integrate
.. //depot/projects/arm/src/sys/arm/at91/at91_pio_rm9200.h#2 integrate
.. //depot/projects/arm/src/sys/arm/at91/at91_piovar.h#3 integrate
.. //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#19 integrate
.. //depot/projects/arm/src/sys/arm/at91/at91_rtc.c#6 integrate
.. //depot/projects/arm/src/sys/arm/at91/at91_spi.c#7 integrate
.. //depot/projects/arm/src/sys/arm/at91/at91_spireg.h#6 integrate
.. //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#37 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/Makefile#6 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/doit.c#5 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/main.c#3 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/Makefile#6 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/main.c#12 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/arm_init.S#5 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/loader_prompt.c#14 branch
.. //depot/projects/arm/src/sys/conf/options.arm#13 integrate

Differences ...

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


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


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


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

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

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

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

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

@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.1 2006/02/04 23:32:13 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.2 2006/07/14 21:35:59 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

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

@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $FreeBSD: src/sys/arm/at91/at91_spireg.h,v 1.1 2006/02/04 23:32:13 imp Exp $ */
+/* $FreeBSD: src/sys/arm/at91/at91_spireg.h,v 1.2 2006/07/14 21:35:59 imp Exp $ */
 
 #ifndef ARM_AT91_AT91_SPIREG_H
 #define ARM_AT91_AT91_SPIREG_H

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

@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.7 2006/07/02 03:45:33 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.8 2006/07/14 21:33:04 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/Makefile#6 (text) ====


==== //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/doit.c#5 (text+ko) ====


==== //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/main.c#3 (text) ====


==== //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/Makefile#6 (text) ====


==== //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/main.c#12 (text) ====


==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/arm_init.S#5 (text+ko) ====


==== //depot/projects/arm/src/sys/conf/options.arm#13 (text+ko) ====

@@ -1,4 +1,4 @@
-#$FreeBSD: src/sys/conf/options.arm,v 1.10 2006/06/06 21:06:57 cognet Exp $
+#$FreeBSD: src/sys/conf/options.arm,v 1.11 2006/07/14 21:59:54 imp Exp $
 ARM9_CACHE_WRITE_THROUGH	opt_global.h
 ARM_CACHE_LOCK_ENABLE	opt_global.h
 ARMFPE			opt_global.h