svn commit: r222621 - in projects/pseries/powerpc: include ofw

[Nathan Whitehorn]

Author: nwhitehorn
Date: Thu Jun  2 14:32:15 2011
New Revision: 222621
URL: http://svn.freebsd.org/changeset/base/222621

Log:
  Loop back infrastructural changes merged from this branch to HEAD.

Modified:
  projects/pseries/powerpc/include/rtas.h   (contents, props changed)
  projects/pseries/powerpc/ofw/ofwcall32.S   (contents, props changed)
  projects/pseries/powerpc/ofw/ofwcall64.S   (contents, props changed)
  projects/pseries/powerpc/ofw/rtas.c   (contents, props changed)
Directory Properties:
  projects/pseries/   (props changed)
  projects/pseries/amd64/include/xen/   (props changed)
  projects/pseries/boot/   (props changed)
  projects/pseries/boot/i386/efi/   (props changed)
  projects/pseries/boot/ia64/efi/   (props changed)
  projects/pseries/boot/ia64/ski/   (props changed)
  projects/pseries/boot/powerpc/boot1.chrp/   (props changed)
  projects/pseries/boot/powerpc/ofw/   (props changed)
  projects/pseries/cddl/contrib/opensolaris/   (props changed)
  projects/pseries/conf/   (props changed)
  projects/pseries/contrib/dev/acpica/   (props changed)
  projects/pseries/contrib/octeon-sdk/   (props changed)
  projects/pseries/contrib/pf/   (props changed)
  projects/pseries/contrib/x86emu/   (props changed)

Modified: projects/pseries/powerpc/include/rtas.h
==============================================================================
--- projects/pseries/powerpc/include/rtas.h	Thu Jun  2 14:25:52 2011	(r222620)
+++ projects/pseries/powerpc/include/rtas.h	Thu Jun  2 14:32:15 2011	(r222621)
@@ -22,6 +22,8 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_RTAS_H_

Modified: projects/pseries/powerpc/ofw/ofwcall32.S
==============================================================================
--- projects/pseries/powerpc/ofw/ofwcall32.S	Thu Jun  2 14:25:52 2011	(r222620)
+++ projects/pseries/powerpc/ofw/ofwcall32.S	Thu Jun  2 14:32:15 2011	(r222621)
@@ -21,6 +21,8 @@
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
  */
 
 #include <sys/syscall.h>

Modified: projects/pseries/powerpc/ofw/ofwcall64.S
==============================================================================
--- projects/pseries/powerpc/ofw/ofwcall64.S	Thu Jun  2 14:25:52 2011	(r222620)
+++ projects/pseries/powerpc/ofw/ofwcall64.S	Thu Jun  2 14:32:15 2011	(r222621)
@@ -21,6 +21,8 @@
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
  */
 
 #include <sys/syscall.h>

Modified: projects/pseries/powerpc/ofw/rtas.c
==============================================================================
--- projects/pseries/powerpc/ofw/rtas.c	Thu Jun  2 14:25:52 2011	(r222620)
+++ projects/pseries/powerpc/ofw/rtas.c	Thu Jun  2 14:32:15 2011	(r222621)
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: projects/pseries/powerpc/ofw/ofw_real.c 222059 2011-05-18 15:07:36Z nwhitehorn $");
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/kernel.h>