Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 10 Jan 2007 06:53:51 GMT
From:      Warner Losh <imp@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 112698 for review
Message-ID:  <200701100653.l0A6rpHf065601@repoman.freebsd.org>

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

Change 112698 by imp@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



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