Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 19 May 2006 21:33:21 GMT
From:      Olivier Houchard <cognet@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 97471 for review
Message-ID:  <200605192133.k4JLXLjc058891@repoman.freebsd.org>

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

Change 97471 by cognet@cognet on 2006/05/19 21:33:08

	Fix mismerge.

Affected files ...

.. //depot/projects/arm/src/sys/conf/options.arm#9 edit

Differences ...

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

@@ -10,6 +10,7 @@
 CPU_ARM9		opt_global.h
 CPU_XSCALE_80321	opt_global.h
 KERNPHYSADDR		opt_global.h
+KERNVIRTADDR		opt_global.h
 PHYSADDR		opt_global.h
 SKYEYE_WORKAROUNDS	opt_global.h
 STARTUP_PAGETABLE_ADDR	opt_global.h



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