From owner-svn-src-stable-7@FreeBSD.ORG  Thu Mar 19 12:32:13 2009
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6573710656F2;
	Thu, 19 Mar 2009 12:32:13 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 528E38FC16;
	Thu, 19 Mar 2009 12:32:13 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2JCWDAU060841;
	Thu, 19 Mar 2009 12:32:13 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2JCWDYx060840;
	Thu, 19 Mar 2009 12:32:13 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <200903191232.n2JCWDYx060840@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Thu, 19 Mar 2009 12:32:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r190028 - in stable/7/sys: . conf contrib/pf
	dev/ath/ath_hal dev/cxgb
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Mar 2009 12:32:14 -0000

Author: marius
Date: Thu Mar 19 12:32:13 2009
New Revision: 190028
URL: http://svn.freebsd.org/changeset/base/190028

Log:
  MFC: r182729
  
  Switch sun4v to back to using its own clock.c, which was ressurected
  in r190005, as the sparc64 version is going to be rototilled and sun4v
  currently can't be verified to still work with the new sparc64 one
  due to its overall state.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/conf/files.sun4v
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/conf/files.sun4v
==============================================================================
--- stable/7/sys/conf/files.sun4v	Thu Mar 19 12:31:59 2009	(r190027)
+++ stable/7/sys/conf/files.sun4v	Thu Mar 19 12:32:13 2009	(r190028)
@@ -34,7 +34,7 @@ libkern/fls.c			standard
 libkern/flsl.c			standard
 sparc64/sparc64/autoconf.c	standard
 sun4v/sun4v/bus_machdep.c	standard
-sparc64/sparc64/clock.c		standard
+sun4v/sun4v/clock.c		standard
 sparc64/sparc64/db_disasm.c	optional	ddb
 sun4v/sun4v/db_interface.c	optional	ddb
 sun4v/sun4v/db_trace.c	optional	ddb