PERFORCE change 97471 for review

[Olivier Houchard]

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

Change 97471 by cognet at 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