Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 14 Sep 2006 21:48:53 GMT
From:      Warner Losh <imp@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 106122 for review
Message-ID:  <200609142148.k8ELmrvK084422@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=106122

Change 106122 by imp@imp_paco-paco on 2006/09/14 21:47:57

	IFC fixups

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/arm_init.S#7 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/env_vars.c#10 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/env_vars.h#3 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.c#20 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.h#9 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/delay.c#4 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac_init.c#3 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#4 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.c#14 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.h#8 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/reset.c#5 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/sd-card.c#9 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/sd-card.h#3 integrate

Differences ...

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

@@ -20,7 +20,7 @@
  * only.
  * END_BLOCK
  *
- * $FreeBSD: src/sys/boot/arm/at91/bootspi/arm_init.S,v 1.1 2006/08/16 23:39:58 imp Exp $
+ * $FreeBSD: src/sys/boot/arm/at91/bootspi/arm_init.S,v 1.2 2006/08/17 00:14:32 imp Exp $
  ******************************************************************************/
 
 	.equ	ARM_MODE_USER,	0x10

==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/env_vars.c#10 (text+ko) ====


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


==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.c#20 (text+ko) ====


==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.h#9 (text+ko) ====


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


==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac_init.c#3 (text+ko) ====


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


==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.c#14 (text+ko) ====


==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.h#8 (text+ko) ====


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


==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/sd-card.c#9 (text+ko) ====


==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/sd-card.h#3 (text+ko) ====




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200609142148.k8ELmrvK084422>