PERFORCE change 112698 for review

[Warner Losh]

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

Change 112698 by imp at imp_lighthouse on 2007/01/10 06:53:29

	fix mismerge

Affected files ...

.. //depot/projects/arm/src/sys/arm/conf/TSC4370#20 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/conf/TSC4370#20 (text+ko) ====

@@ -65,8 +65,7 @@
 options 	MUTEX_NOINLINE
 options 	NO_FFS_SNAPSHOT
 options 	NO_SWAPPING
-options 	PPS_SYNC		# ntp time sync with pps
-options 	ARM32_NEW_VM_LAYOUT
+
 device		genclock
 device		loop
 device		random